summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2015-09-30 03:59:23 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:43:37 +0100
commitf68d739357dd0ce9a971a5d7f5eaab27bbc2c9c1 (patch)
treedc82bf10a3a14b23e5e5c816f8aa7db821df3678 /meta
parenta7ac905b8cf9adcbaee6221938c52bf371aab2f4 (diff)
downloadpoky-f68d739357dd0ce9a971a5d7f5eaab27bbc2c9c1.tar.gz
apr: cleanup buildpaths from target stuffs
* cleanup buildpaths from apr_rules.mk and apr-1-config: - remove ${STAGING_DIR_HOST} from CC, CPP ... - set APR_SOURCE_DIR, APR_BUILD_DIR as empty * install ${HOST_SYS}-libtool to sysroot only, it's required for building apache2 but not suitable for target. (From OE-Core rev: 44c1a6af03ce9b45e5bfd6956062aa2b3a1be741) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/apr/apr_1.5.2.bb9
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-support/apr/apr_1.5.2.bb b/meta/recipes-support/apr/apr_1.5.2.bb
index c1f7f380ed..e12a17625f 100644
--- a/meta/recipes-support/apr/apr_1.5.2.bb
+++ b/meta/recipes-support/apr/apr_1.5.2.bb
@@ -55,7 +55,13 @@ do_configure_append() {
55do_install_append() { 55do_install_append() {
56 oe_multilib_header apr.h 56 oe_multilib_header apr.h
57 install -d ${D}${datadir}/apr 57 install -d ${D}${datadir}/apr
58 cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool 58}
59
60do_install_append_class-target() {
61 sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk
62 sed -i -e 's,${STAGING_DIR_HOST},,g' \
63 -e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \
64 -e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apr-1-config
59} 65}
60 66
61SSTATE_SCAN_FILES += "apr_rules.mk libtool" 67SSTATE_SCAN_FILES += "apr_rules.mk libtool"
@@ -73,6 +79,7 @@ apr_sysroot_preprocess () {
73 cp ${S}/build/mkdir.sh $d/ 79 cp ${S}/build/mkdir.sh $d/
74 cp ${S}/build/make_exports.awk $d/ 80 cp ${S}/build/make_exports.awk $d/
75 cp ${S}/build/make_var_export.awk $d/ 81 cp ${S}/build/make_var_export.awk $d/
82 cp ${S}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${datadir}/build-1/libtool
76} 83}
77 84
78do_compile_ptest() { 85do_compile_ptest() {