summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-03-03 20:34:30 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-05 13:14:53 +0000
commita2d97d559815a639a6852d5c7ac830489fe30b32 (patch)
tree1d5e8abfb58fd6057cc5662369bad316b85f3426
parentda9a41587bd8716dbd6ccedfd5afcd8431043745 (diff)
downloadpoky-a2d97d559815a639a6852d5c7ac830489fe30b32.tar.gz
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 ] (From OE-Core rev: 9d590d714c67ffcf1cd3f3844f5b102f72c2d006) 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>
-rw-r--r--meta/recipes-support/apr/apr_1.4.6.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-support/apr/apr_1.4.6.bb b/meta/recipes-support/apr/apr_1.4.6.bb
index b7220e0c1f..77dffee12c 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 \
9 9
10BBCLASSEXTEND = "native" 10BBCLASSEXTEND = "native"
11 11
12PR = "r1" 12PR = "r2"
13 13
14SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ 14SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
15 file://configure_fixes.patch \ 15 file://configure_fixes.patch \
@@ -43,7 +43,7 @@ do_install_append() {
43 cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool 43 cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool
44} 44}
45 45
46SSTATE_SCAN_FILES += "apr_rules.mk" 46SSTATE_SCAN_FILES += "apr_rules.mk libtool"
47 47
48SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess" 48SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
49 49