diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-08-26 10:01:04 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-09-15 16:16:58 +0200 |
| commit | 6466de31048260089b8988280f77efdb14ac2f21 (patch) | |
| tree | eb3e042a3cb186039c47e69a6e31a24161ec0c34 | |
| parent | e4d19d36877b6f608cef9e395504cd5b424e1920 (diff) | |
| download | openembedded-core-6466de31048260089b8988280f77efdb14ac2f21.tar.gz openembedded-core-6466de31048260089b8988280f77efdb14ac2f21.tar.bz2 openembedded-core-6466de31048260089b8988280f77efdb14ac2f21.tar.xz openembedded-core-6466de31048260089b8988280f77efdb14ac2f21.zip | |
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
"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion/neon-detection.patch | 15 | ||||
| -rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.6.15.bb | 5 |
2 files changed, 2 insertions, 18 deletions
diff --git a/meta/recipes-devtools/subversion/subversion/neon-detection.patch b/meta/recipes-devtools/subversion/subversion/neon-detection.patch deleted file mode 100644 index 2a9cf1fa8..000000000 --- a/meta/recipes-devtools/subversion/subversion/neon-detection.patch +++ /dev/null @@ -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() diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb index 4e77e2eff..9a9484f8d 100644 --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb @@ -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}" |