sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Wenzong Fan 2015-09-30 03:59:23 -04:00 committed by Richard Purdie
parent a7ac905b8c
commit f68d739357
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/recipes-support/apr/apr_1.5.2.bb
View File

@ -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() {