apr-util: fix the rules.mk with path to sysroot instead of the workdir of apr
cover apr-util: fix the rules.mk with path to sysroot instead of the workdir of apr
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]
---
The following changes since commit 24babf9316da50c8a4d2f328c4336cb8cd6cf667:
classes/chrpath: trigger an error if chrpath fails (2012-08-15 17:51:04 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/bug2947_apr_0817
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/bug2947_apr_0817
Jackie Huang (1):
apr-util: fix the rules.mk with path to sysroot instead of the
workdir of apr
meta/recipes-support/apr/apr-util_1.4.1.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.4
PATCH 1/1 apr-util: fix the rules.mk with path to sysroot instead of the workdir of apr
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]
--- meta/recipes-support/apr/apr-util_1.4.1.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-support/apr/apr-util_1.4.1.bb +4 -2
@@ -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
Signature · 1 line
1.7.4
Quoted 21 lines · 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 whichAPR_MKEXPORTpoints to the workdir of apr and cause compile filure when the workdir of apr is removed. So change the copying in_prependto_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(-)meta/recipes-support/apr/apr-util_1.4.1.bb +0
-0@@ -32,8 +32,10 @@ inherit autotools lib_package binconfig OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
meta/recipes-support/apr/apr-util_1.4.1.bb inherit autotools lib_package binconfig · line 41
Quoted 10 lines
meta/recipes-support/apr/apr-util_1.4.1.bb +4
-2-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?
Shouldn't be the same fix prepend/append applied for native case too and then "${PN}" == "${BPN}" won't be needed?
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 23 lines · Martin Jansa
Quoted 22 lines · 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 whichAPR_MKEXPORTpoints to the workdir of apr and cause compile filure when the workdir of apr is removed. So change the copying in_prependto_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(-)meta/recipes-support/apr/apr-util_1.4.1.bb +0
-0@@ -32,8 +32,10 @@ inherit autotools lib_package binconfig OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
Quoted 12 lines
meta/recipes-support/apr/apr-util_1.4.1.bb inherit autotools lib_package binconfig · line 41
Quoted 9 lines
meta/recipes-support/apr/apr-util_1.4.1.bb +4
-2-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.mkWhy 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 ---
Quoted 1 line
location=installed
Thanks,
Jackie
Quoted 12 lines
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
Signature · 5 lines
Jackie Huang WIND RIVER | China Development Center MSN:[email protected] Tel: +86 8477 8594 Mobile: +86 138 1027 4745
Saul Wold
AppliedQuoted 19 lines · On 08/16/2012 08:11 PM, [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 whichAPR_MKEXPORTpoints to the workdir of apr and cause compile filure when the workdir of apr is removed. So change the copying in_prependto_append.[YOCTO #2947]
Signed-off-by Jackie Huang <[email protected]>---
The following changes since commit24babf9316da50c8a4d2f328c4336cb8cd6cf667:classes/chrpath: trigger an error if chrpath fails (2012-08-15 17:51:04 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/bug2947_apr_0817 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/bug2947_apr_0817
Quoted 7 lines
Jackie Huang (1):
apr-util: fix the rules.mk with path to sysroot instead of the
workdir of aprmeta/recipes-support/apr/apr-util_1.4.1.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
Merged into OE-Core
Thanks
Sau!