Re: [PATCH 1/1] apr-util: fix the rules.mk with path to sysroot instead of the workdir of apr

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

On Fri, Aug 17, 2012 at 11:11:43AM +0800, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> 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 <jackie.huang@windriver.com>
> ---
>  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?

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

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]