diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2012-08-17 11:11:43 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-17 13:10:08 +0100 |
| commit | bddd8300325267253941e7ce656ce2cf86a8a4a4 (patch) | |
| tree | ae3f3e325d415a83cc63347a09f4d7f0def16954 /meta/recipes-support | |
| parent | 9b6a3ff565aa99bef987187913ad91c33eecf5cc (diff) | |
| download | ast2050-yocto-poky-bddd8300325267253941e7ce656ce2cf86a8a4a4.zip ast2050-yocto-poky-bddd8300325267253941e7ce656ce2cf86a8a4a4.tar.gz | |
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]
(From OE-Core rev: d6aa123fdbfa82c07e33a9b4c7aacad821184790)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/apr/apr-util_1.4.1.bb | 6 |
1 files changed, 4 insertions, 2 deletions
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 deb608f..0516bc4 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 |
