summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch36
-rw-r--r--meta/recipes-devtools/subversion/subversion/disable-revision-install.patch (renamed from meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch)0
-rw-r--r--meta/recipes-devtools/subversion/subversion/libtool2.patch (renamed from meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch)0
-rw-r--r--meta/recipes-devtools/subversion/subversion/neon-detection.patch13
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.6.13.bb (renamed from meta/recipes-devtools/subversion/subversion_1.5.5.bb)7
5 files changed, 18 insertions, 38 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch b/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch
deleted file mode 100644
index b567d5c050..0000000000
--- a/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4
2index 9fcf859..8d964f3 100644
3--- a/build/ac-macros/neon.m4
4+++ b/build/ac-macros/neon.m4
5@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON,
6 if test "$withval" = "yes" ; then
7 AC_MSG_ERROR([--with-neon requires an argument.])
8 else
9- neon_config="$withval/bin/neon-config"
10+ neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon"
11 fi
12
13 SVN_NEON_CONFIG()
14@@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG()
15 dnl neon-config found, gather relevant information from it
16 AC_DEFUN(SVN_NEON_CONFIG,
17 [
18- if test -f "$neon_config"; then
19- if test "$neon_config" != ""; then
20+ if true; then
21+ if true; then
22 AC_MSG_CHECKING([neon library version])
23- NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
24+ NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'`
25 AC_MSG_RESULT([$NEON_VERSION])
26
27 if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
28@@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG,
29 test "$svn_allowed_neon" = "any"; then
30 svn_allowed_neon_on_system="yes"
31 SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
32- NEON_LIBS=`$neon_config --la-file`
33+ NEON_LIBS=`$neon_config --libs`
34 CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
35 svn_lib_neon="yes"
36 break
diff --git a/meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
index a1c60654cb..a1c60654cb 100644
--- a/meta/recipes-devtools/subversion/subversion-1.5.5/disable-revision-install.patch
+++ b/meta/recipes-devtools/subversion/subversion/disable-revision-install.patch
diff --git a/meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch b/meta/recipes-devtools/subversion/subversion/libtool2.patch
index 08343b09ec..08343b09ec 100644
--- a/meta/recipes-devtools/subversion/subversion-1.5.5/libtool2.patch
+++ b/meta/recipes-devtools/subversion/subversion/libtool2.patch
diff --git a/meta/recipes-devtools/subversion/subversion/neon-detection.patch b/meta/recipes-devtools/subversion/subversion/neon-detection.patch
new file mode 100644
index 0000000000..eaf6de0375
--- /dev/null
+++ b/meta/recipes-devtools/subversion/subversion/neon-detection.patch
@@ -0,0 +1,13 @@
1Index: subversion-1.6.13/build/ac-macros/neon.m4
2===================================================================
3--- subversion-1.6.13.orig/build/ac-macros/neon.m4
4+++ subversion-1.6.13/build/ac-macros/neon.m4
5@@ -42,7 +42,7 @@ AC_DEFUN(SVN_LIB_NEON,
6 AC_MSG_ERROR([--with-neon requires an argument.])
7 fi
8 else
9- neon_config="$withval/bin/neon-config"
10+ neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon"
11 fi
12
13 SVN_NEON_CONFIG()
diff --git a/meta/recipes-devtools/subversion/subversion_1.5.5.bb b/meta/recipes-devtools/subversion/subversion_1.6.13.bb
index 447727484e..bcdb6c22ea 100644
--- a/meta/recipes-devtools/subversion/subversion_1.5.5.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.13.bb
@@ -5,14 +5,17 @@ RDEPENDS = "neon"
5LICENSE = "Apache BSD" 5LICENSE = "Apache BSD"
6HOMEPAGE = "http://subversion.tigris.org" 6HOMEPAGE = "http://subversion.tigris.org"
7 7
8PR = "r7" 8PR = "r0"
9 9
10SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ 10SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
11 file://disable-revision-install.patch;patch=1 \ 11 file://disable-revision-install.patch;patch=1 \
12 file://neon-detection.patch;patch=1 \ 12 file://neon-detection.patch;patch=1 \
13 file://libtool2.patch;patch=1" 13 file://libtool2.patch;patch=1"
14 14
15LIC_FILES_CHKSUM = "file://COPYING;md5=b592c67ecb801ccc95e236f186ec33fd" 15SRC_URI[md5sum] = "7ae1c827689f21cf975804005be30aeb"
16SRC_URI[sha256sum] = "3a30327bdb04109f369586196ee4a6993cdab2cfa85c3134549f02c229bf0d15"
17
18LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
16 19
17EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ 20EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
18 --without-berkeley-db --without-apxs --without-apache \ 21 --without-berkeley-db --without-apxs --without-apache \