On 8/17/2012 8:13 PM, Martin Jansa wrote:
On Fri, Aug 17, 2012 at 11:11:43AM +0800, [email protected] wrote:
From: Jackie Huang <[email protected]>

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 <[email protected]>
---
  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

Why is it different then native case above?


The bug didn't happen in native case since the related paths in rules.mk generated by configure for apr-util-native were pointed to the correct dirs in sysroot, so this fix is only applied for BPN.

And I checked that what makes this difference is the different 'location' in apr-1-config of BPN and native one:

$ diff intel-atom/usr/bin/crossscripts/apr-1-config x86_64-linux/usr/bin/apr-1-config | tail -n 4
49c49
< location=source
---
> location=installed


Thanks,
Jackie

Shouldn't be the same fix prepend/append applied for native case too and
then "${PN}" == "${BPN}" won't be needed?

Cheers,



_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


--
Jackie Huang
WIND RIVER | China Development Center
MSN:[email protected]
Tel: +86 8477 8594
Mobile: +86 138 1027 4745

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to