[oe-commits] org.oe.dev subversion: added a patch to detect neon and enable dav protocol handler

[polyonymous commit]

subversion: added a patch to detect neon and enable dav protocol handler

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 7fd1c11843dc12d737a632cfdee28fe210d41822
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7fd1c11843dc12d737a632cfdee28fe210d41822
Files:
1
packages/subversion/files/neon-detection.patch
packages/subversion/subversion_1.4.0.bb
Diffs:

#
# mt diff -r0729be8dca45c1227355c3901765c3b8bff0ef89 -r7fd1c11843dc12d737a632cfdee28fe210d41822
#
# 
# 
# add_file "packages/subversion/files/neon-detection.patch"
#  content [4c5e9fec1964e3f418120be8b671c0ff23b33e5e]
# 
# patch "packages/subversion/subversion_1.4.0.bb"
#  from [c1cb0c54cea1d9e32623b5202b52e216b987317b]
#    to [63fc05fad54b18fb594994d0acee71f0c48b322f]
# 
============================================================
--- packages/subversion/files/neon-detection.patch	4c5e9fec1964e3f418120be8b671c0ff23b33e5e
+++ packages/subversion/files/neon-detection.patch	4c5e9fec1964e3f418120be8b671c0ff23b33e5e
@@ -0,0 +1,36 @@
+diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4
+index 9fcf859..8d964f3 100644
+--- a/build/ac-macros/neon.m4
++++ b/build/ac-macros/neon.m4
+@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON,
+     if test "$withval" = "yes" ; then
+       AC_MSG_ERROR([--with-neon requires an argument.])
+     else
+-      neon_config="$withval/bin/neon-config"
++      neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon"
+     fi
+ 
+     SVN_NEON_CONFIG()
+@@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG()
+ dnl neon-config found, gather relevant information from it
+ AC_DEFUN(SVN_NEON_CONFIG,
+ [
+-  if test -f "$neon_config"; then
+-    if test "$neon_config" != ""; then
++  if true; then
++    if true; then
+       AC_MSG_CHECKING([neon library version])
+-      NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
++      NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'`
+       AC_MSG_RESULT([$NEON_VERSION])
+ 
+       if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
+@@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG,
+            test "$svn_allowed_neon" = "any"; then
+             svn_allowed_neon_on_system="yes"
+             SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
+-            NEON_LIBS=`$neon_config --la-file`
++            NEON_LIBS=`$neon_config --libs`
+             CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
+             svn_lib_neon="yes"
+             break
============================================================
--- packages/subversion/subversion_1.4.0.bb	c1cb0c54cea1d9e32623b5202b52e216b987317b
+++ packages/subversion/subversion_1.4.0.bb	63fc05fad54b18fb594994d0acee71f0c48b322f
@@ -1,14 +1,16 @@ DEPENDS = "apr-util neon"
 DESCRIPTION = "The Subversion (svn) client"
 SECTION = "console/network"
 DEPENDS = "apr-util neon"
+RDEPENDS = "neon"
 LICENSE = "Apache/BSD"
 HOMEPAGE = "http://subversion.tigris.org"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
-           file://disable-revision-install.patch;patch=1"
+           file://disable-revision-install.patch;patch=1 \
+	   file://neon-detection.patch;patch=1"
 
-EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \
+EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
                 --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS}"
@@ -21,5 +23,6 @@ do_configure() {
 do_configure() {
 	gnu-configize
 	libtoolize --force
+	aclocal -I build/ -I build/ac-macros/ && autoconf
 	oe_runconf
 }