summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2010-11-15 14:00:45 -0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:25 -0800
commit9807ad25e50a6d2f924ff0ffc9d266e60c023506 (patch)
treee2133a024aec51ecf187a546745d97dff36ec353
parent1b3dab588bc95f2aaca468286df358b00af2ef1a (diff)
downloadpoky-9807ad25e50a6d2f924ff0ffc9d266e60c023506.tar.gz
subversion: Fix host contamination
The with-sasl check was looking into /usr/local, so a prepend_configure was added to modify the /usr/local to ${STAGING_DIR} in build/ac-macros/sasl.m4 Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-devtools/subversion/subversion_1.5.5.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-devtools/subversion/subversion_1.5.5.bb b/meta/recipes-devtools/subversion/subversion_1.5.5.bb
index 8adac8a6fa..447727484e 100644
--- a/meta/recipes-devtools/subversion/subversion_1.5.5.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.5.5.bb
@@ -5,13 +5,15 @@ RDEPENDS = "neon"
5LICENSE = "Apache BSD" 5LICENSE = "Apache BSD"
6HOMEPAGE = "http://subversion.tigris.org" 6HOMEPAGE = "http://subversion.tigris.org"
7 7
8PR = "r6" 8PR = "r7"
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"
16
15EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ 17EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
16 --without-berkeley-db --without-apxs --without-apache \ 18 --without-berkeley-db --without-apxs --without-apache \
17 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ 19 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
@@ -26,4 +28,5 @@ acpaths = "-I build/ -I build/ac-macros/"
26do_configure_prepend () { 28do_configure_prepend () {
27 rm -f ${S}/libtool 29 rm -f ${S}/libtool
28 rm -f ${S}/build/libtool.m4 30 rm -f ${S}/build/libtool.m4
31 sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
29} 32}