subversion: remove neon-detection.patch and --with-neon option
* upstream detection seems to be doing its job right now * I don't see how this is supposed to work -- neon_config="$withval/bin/neon-config" -+ neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon" when neon_config should be sysroots/nokia900/usr/bin/crossscripts/neon-config " (From OE-Core rev: 6466de31048260089b8988280f77efdb14ac2f21) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
49a34b1dc8
commit
e6706bf559
|
@ -1,15 +0,0 @@
|
|||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Index: subversion-1.6.13/build/ac-macros/neon.m4
|
||||
===================================================================
|
||||
--- subversion-1.6.13.orig/build/ac-macros/neon.m4
|
||||
+++ subversion-1.6.13/build/ac-macros/neon.m4
|
||||
@@ -42,7 +42,7 @@ AC_DEFUN(SVN_LIB_NEON,
|
||||
AC_MSG_ERROR([--with-neon requires an argument.])
|
||||
fi
|
||||
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()
|
|
@ -5,11 +5,10 @@ RDEPENDS_${PN} = "neon"
|
|||
LICENSE = "Apache-2"
|
||||
HOMEPAGE = "http://subversion.tigris.org"
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
|
||||
file://disable-revision-install.patch \
|
||||
file://neon-detection.patch \
|
||||
file://libtool2.patch"
|
||||
|
||||
SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
|
||||
|
@ -17,7 +16,7 @@ SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d
|
|||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
|
||||
|
||||
EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
|
||||
EXTRA_OECONF = " \
|
||||
--without-berkeley-db --without-apxs --without-apache \
|
||||
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
|
||||
--with-apr-util=${STAGING_BINDIR_CROSS}"
|
||||
|
|
Loading…
Reference in New Issue