From: Jackie Huang Date: Fri, 17 Aug 2012 03:11:43 +0000 (+0800) Subject: apr-util: fix the rules.mk with path to sysroot instead of the workdir of apr X-Git-Tag: 2015-4~9531 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d6aa123fdbfa82c07e33a9b4c7aacad821184790;p=openembedded-core.git apr-util: fix the rules.mk with path to sysroot instead of the workdir of apr The copying for rules.mk was happened in do_configure_prepend, but it will be replaced by the one generated by configure, in which APR_MKEXPORT points to the workdir of apr and cause compile filure when the workdir of apr is removed. So change the copying in _prepend to _append. [YOCTO #2947] Signed-off-by: Jackie Huang Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb index deb608f8de..0516bc4acc 100644 --- a/meta/recipes-support/apr/apr-util_1.4.1.bb +++ b/meta/recipes-support/apr/apr-util_1.4.1.bb @@ -32,8 +32,10 @@ inherit autotools lib_package binconfig OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" -do_configure_prepend() { - cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk +do_configure_append() { + if [ "${PN}" == "${BPN}" ]; then + cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk + fi } do_configure_prepend_virtclass-native() { cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk