diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-08-26 10:01:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-16 13:30:23 +0100 |
commit | e6706bf559503ba8bc430533efe7eef0405a13ec (patch) | |
tree | 880012f22916d883d5c67e86e75d0c856993869b /meta/recipes-devtools/subversion/subversion_1.6.15.bb | |
parent | 49a34b1dc88f6add70cc40d74294a4a2d9bbde4b (diff) | |
download | poky-e6706bf559503ba8bc430533efe7eef0405a13ec.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion_1.6.15.bb')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion_1.6.15.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb index 4e77e2effe..9a9484f8de 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" | |||
5 | LICENSE = "Apache-2" | 5 | LICENSE = "Apache-2" |
6 | HOMEPAGE = "http://subversion.tigris.org" | 6 | HOMEPAGE = "http://subversion.tigris.org" |
7 | 7 | ||
8 | PR = "r0" | 8 | PR = "r1" |
9 | 9 | ||
10 | SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ | 10 | SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ |
11 | file://disable-revision-install.patch \ | 11 | file://disable-revision-install.patch \ |
12 | file://neon-detection.patch \ | ||
13 | file://libtool2.patch" | 12 | file://libtool2.patch" |
14 | 13 | ||
15 | SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69" | 14 | SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69" |
@@ -17,7 +16,7 @@ SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d | |||
17 | 16 | ||
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b" | 17 | LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b" |
19 | 18 | ||
20 | EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ | 19 | EXTRA_OECONF = " \ |
21 | --without-berkeley-db --without-apxs --without-apache \ | 20 | --without-berkeley-db --without-apxs --without-apache \ |
22 | --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ | 21 | --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ |
23 | --with-apr-util=${STAGING_BINDIR_CROSS}" | 22 | --with-apr-util=${STAGING_BINDIR_CROSS}" |