From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 4 Mar 2013 01:34:30 +0000 (-0500)
Subject: apr: add libtool to SSTATE_SCAN_FILES
X-Git-Tag: yocto-4.0~33738
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d590d714c67ffcf1cd3f3844f5b102f72c2d006;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

apr: add libtool to SSTATE_SCAN_FILES

The hardcoded paths in libtool will cause apache2 compile fail at
link stage when the package apr is installed from sstate cache, so
add libtool to SSTATE_SCAN_FILES.

[ CQID: WIND00405372 ]

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/apr/apr_1.4.6.bb b/meta/recipes-support/apr/apr_1.4.6.bb
index b7220e0c1fe..77dffee12c1 100644
--- a/meta/recipes-support/apr/apr_1.4.6.bb
+++ b/meta/recipes-support/apr/apr_1.4.6.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
 
 BBCLASSEXTEND = "native"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://configure_fixes.patch \
@@ -43,7 +43,7 @@ do_install_append() {
 	cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool
 }
 
-SSTATE_SCAN_FILES += "apr_rules.mk"
+SSTATE_SCAN_FILES += "apr_rules.mk libtool"
 
 SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"