From 44c1a6af03ce9b45e5bfd6956062aa2b3a1be741 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Wed, 30 Sep 2015 03:59:23 -0400 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr_1.5.2.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'meta/recipes-support/apr') 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() { -- cgit 1.2.3-korg