summaryrefslogtreecommitdiffstats
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:40:37 +0100
commit44c1a6af03ce9b45e5bfd6956062aa2b3a1be741 (patch)
tree9ac84373842bff5a7ad1268b25cd9bd76a4ef799
parent3e4978a534afc7fd4b82a044da8d9774cf09a4f0 (diff)
downloadopenembedded-core-contrib-44c1a6af03ce9b45e5bfd6956062aa2b3a1be741.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. Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() {
do_install_append() {
oe_multilib_header apr.h
install -d ${D}${datadir}/apr
- cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool
+}
+
+do_install_append_class-target() {
+ sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk
+ sed -i -e 's,${STAGING_DIR_HOST},,g' \
+ -e 's,APR_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \
+ -e 's,APR_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apr-1-config
}
SSTATE_SCAN_FILES += "apr_rules.mk libtool"
@@ -73,6 +79,7 @@ apr_sysroot_preprocess () {
cp ${S}/build/mkdir.sh $d/
cp ${S}/build/make_exports.awk $d/
cp ${S}/build/make_var_export.awk $d/
+ cp ${S}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${datadir}/build-1/libtool
}
do_compile_ptest() {