subversion: bump to version 1.9.2
PATCH 1/1 subversion: bump to version 1.9.2
- Bump to version 1.9.2.
- Update the hash file.
- Fix a typo in the berkeley-db configure option.
- Remove non-existent configure options: neon, gssapi and ssl.
- Remove neon dependency: is not needed to build subversion.
- Tweak the 0001-dont-mangle-cflags.patch for the 1.9.2 version.
- Add a new 0002-dont-check-mach-o.patch to remove a configure check for Mach-O which breaks the build when cross-compiling.
--- package/subversion/0001-dont-mangle-cflags.patch | 29 +++++---- package/subversion/0002-dont-check-mach-o.patch | 71 ++++++++++++++++++++++ package/subversion/Config.in | 2 - package/subversion/subversion.hash | 4 +- package/subversion/subversion.mk | 10 +-- 5 files changed, 92 insertions(+), 24 deletions(-) create mode 100644 package/subversion/0002-dont-check-mach-o.patch
package/subversion/0001-dont-mangle-cflags.patch +15 -14
@@ -6,23 +6,24 @@ doesn't mangle flags like -mfloat-gprs=double, breaking the build. Patch configure instead of configure.ac as subversion currently doesn't cleanly autoreconf. +[Vincent: tweaked patch for version 1.9.2] + Signed-off-by: Peter Korsgaard <[email protected]> ---- - configure | 4 ++-- +Signed-off-by: Vicente Olivert Riera <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) -Index: subversion-1.7.18/configure +Index: subversion-1.9.2/configure =================================================================== ---- subversion-1.7.18.orig/configure -+++ subversion-1.7.18/configure -@@ -19798,8 +19798,8 @@ - CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG" - CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG" +--- subversion-1.9.2.orig/configure ++++ subversion-1.9.2/configure +@@ -21854,8 +21854,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu elif test "$enable_debugging" = "no" ; then -- CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`" -- CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`" -+ CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9]* //g'`" -+ CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9]* //g'`" - CFLAGS="$CFLAGS -DNDEBUG" - CXXFLAGS="$CXXFLAGS -DNDEBUG" + { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling debugging" >&5 + $as_echo "$as_me: Disabling debugging" >&6;} +- CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`" +- CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`" ++ CFLAGS="`echo $CFLAGS' ' | $SED -e 's/-g[0-9]* //g'`" ++ CXXFLAGS="`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9]* //g'`" + CFLAGS="$CFLAGS -DNDEBUG" + CXXFLAGS="$CXXFLAGS -DNDEBUG" # elif test "$enable_debugging" = "maybe" ; then
package/subversion/0002-dont-check-mach-o.patch new file +71 -0
71 lines not on this page · raw message
package/subversion/Config.in +0 -2
@@ -6,8 +6,6 @@ config BR2_PACKAGE_SUBVERSION depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # apr select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_NEON - select BR2_PACKAGE_NEON_XML select BR2_PACKAGE_ZLIB select BR2_PACKAGE_SQLITE help
package/subversion/subversion.hash +2 -2
@@ -1,2 +1,2 @@ -# From https://mail-archives.apache.org/mod_mbox/subversion-dev/201412.mbox/%3C548F4EEB.7030601 at apache.org%3E -sha1 bb3cd135bbd856e7f0f2d59313f075b9bbec9848 subversion-1.7.19.tar.gz +# From http://mail-archives.apache.org/mod_mbox/subversion-dev/201509.mbox/%3CCAP_GPNgyXK9ZGWZ4M2t1dWBSiKEuGbuiRVGw2AF3-MpUZ%3DTRQA%40mail.gmail.com%3E +sha1 fb9db3b7ddf48ae37aa8785872301b59bfcc7017 subversion-1.9.2.tar.bz2
package/subversion/subversion.mk +4 -6
@@ -4,24 +4,22 @@ # ################################################################################ -SUBVERSION_VERSION = 1.7.19 +SUBVERSION_VERSION = 1.9.2 +SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = http://archive.apache.org/dist/subversion SUBVERSION_LICENSE = Apache-2.0 SUBVERSION_LICENSE_FILES = LICENSE -SUBVERSION_DEPENDENCIES = host-pkgconf apr apr-util expat neon zlib sqlite +SUBVERSION_DEPENDENCIES = host-pkgconf apr apr-util expat zlib sqlite SUBVERSION_CONF_OPTS = \ --with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ --with-zlib=$(STAGING_DIR)/usr \ - --with-neon=$(STAGING_DIR)/usr \ - --without-gssapi \ --without-serf \ --without-apxs \ - --without-berkeyley-db \ + --without-berkeley-db \ --without-sasl \ --without-gnome-keyring \ - --without-ssl \ --without-libmagic $(eval $(autotools-package))
Signature · 1 line
1.7.1
PATCH 1/1 subversion: bump to version 1.9.2
Dear Vicente Olivert Riera,
package/subversion/subversion.mk line 9
Quoted 4 lines · Vicente Olivert Riera
package/subversion/subversion.mk +2
-1-SUBVERSION_VERSION = 1.7.19 +SUBVERSION_VERSION = 1.9.2 +SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = http://archive.apache.org/dist/subversion
As of right now, this location doesn't work:
thomas at skate:~/projets/buildroot (subversion-bump)$ make subversion-extract
Quoted 1 line
Quoted 1 line
Quoted 1 line
subversion 1.9.2 Downloading
--2015-09-27 23:21:07-- http://archive.apache.org/dist/subversion/subversion-1.9.2.tar.bz2
Resolving archive.apache.org (archive.apache.org)... 140.211.11.131, 192.87.106.229, 2001:610:1:80bc:192:87:106:229 Connecting to archive.apache.org (archive.apache.org)|140.211.11.131|:80... connected.
HTTP request sent, awaiting response... 404 Not Found
2015-09-27 23:21:07 ERROR 404: Not Found.
And indeed, I don't see 1.9.2 in
http://archive.apache.org/dist/subversion/, the latest is 1.9.1, even if 1.9.2 is advertised as the latest version at
https://subversion.apache.org/download.cgi#recommended-release, and available from other mirrors.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 subversion: bump to version 1.9.2
In reply to Vicente Olivert RieraDear Vicente Olivert Riera,
Quoted 10 lines · Vicente Olivert Riera
- Bump to version 1.9.2.
- Update the hash file.
- Fix a typo in the berkeley-db configure option.
- Remove non-existent configure options: neon, gssapi and ssl.
- Remove neon dependency: is not needed to build subversion.
- Tweak the 0001-dont-mangle-cflags.patch for the 1.9.2 version.
- Add a new 0002-dont-check-mach-o.patch to remove a configure check for Mach-O which breaks the build when cross-compiling.Signed-off-by Vicente Olivert Riera <[email protected]>
Note: subversion now autoreconfigures properly, so patching the configure script directly is not good, configure.ac should be patched instead.
Quoted 12 lines
package/subversion/0002-dont-check-mach-o.patch new file +6
-0@@ -0,0 +1,71 @@ +Don't check for Apple's Mach-O during configure phase + +Mach-O is a short for Mach Object file format, which is used by most +systems based on the Mach Kernel, like NeXTSTEP, OS X, or iOS. [1] + +Given that Buildroot only supports Linux kernels, and also given that
package/subversion/0002-dont-check-mach-o.patch line 16
Quoted 10 lines
package/subversion/0002-dont-check-mach-o.patch new file +10
-0+this check breaks the build when cross-compiling... + +checking for Mach-O dynamic module iteration functions +error: cannot run test program while cross compiling + +..., it's safe to remove this check from the configure script. + +[1] : https://en.wikipedia.org/wiki/Mach-OM + +Signed-off-by: Vicente Olivert Riera <[email protected]>
Ideally, this should be solved by running the autoconf test only on the corresponding OS, or adding a cache variable to feed the result of the test (which is normally what is done for most AC_RUN_IFELSE tests).
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com