[poky] [PATCH 4/5] subversion: Fix host contamination

Saul Wold sgw at linux.intel.com
Mon Nov 15 14:00:45 PST 2010


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 at linux.intel.com>
---
 .../subversion/subversion_1.5.5.bb                 |    5 ++++-
 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 8adac8a..4477274 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"
 LICENSE = "Apache BSD"
 HOMEPAGE = "http://subversion.tigris.org"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
            file://disable-revision-install.patch;patch=1 \
 	   file://neon-detection.patch;patch=1 \
 	   file://libtool2.patch;patch=1"
 
+LIC_FILES_CHKSUM = "file://COPYING;md5=b592c67ecb801ccc95e236f186ec33fd"
+
 EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
                 --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
@@ -26,4 +28,5 @@ acpaths = "-I build/ -I build/ac-macros/"
 do_configure_prepend () {
 	rm -f ${S}/libtool
 	rm -f ${S}/build/libtool.m4
+	sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4
 }
-- 
1.7.1




More information about the poky mailing list