Patchwork [1/3] libpcre: the generated libtool uses HOST_SYS

login
register
mail settings
Submitter Christopher Larson
Date Aug. 19, 2011, 9:56 p.m.
Message ID <1313790985-3332-1-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/10297/
State New, archived
Headers show

Comments

Christopher Larson - Aug. 19, 2011, 9:56 p.m.
From: Chris Larson <chris_larson@mentor.com>

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 meta/recipes-support/libpcre/libpcre_8.12.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Saul Wold - Aug. 24, 2011, 3:43 a.m.
On 08/19/2011 02:56 PM, Chris Larson wrote:
> From: Chris Larson<chris_larson@mentor.com>
>
> Signed-off-by: Chris Larson<chris_larson@mentor.com>
> ---
>   meta/recipes-support/libpcre/libpcre_8.12.bb |    8 ++++----
>   1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-support/libpcre/libpcre_8.12.bb b/meta/recipes-support/libpcre/libpcre_8.12.bb
> index 9216777..24d91c3 100644
> --- a/meta/recipes-support/libpcre/libpcre_8.12.bb
> +++ b/meta/recipes-support/libpcre/libpcre_8.12.bb
> @@ -30,11 +30,11 @@ EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10
>   do_compile () {
>   	# stop libtool from trying to link with host libraries - fix from #33
>   	# this resolve build problem on amd64 - #1015
> -	if [ -e ${S}/${TARGET_SYS}-libtool ] ; then
> -		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
> +	if [ -e ${S}/${HOST_SYS}-libtool ] ; then
> +		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool
>   	else
> -		ln -sf ${S}/libtool ${S}/${TARGET_SYS}-libtool
> -		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool	
> +		ln -sf ${S}/libtool ${S}/${HOST_SYS}-libtool
> +		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool
>   	fi
>
>   	# The generation of dftables can lead to timestamp problems with ccache

This whole series was merged into OE-Core (3 of 3) total.

Thanks
	Sau!

Patch

diff --git a/meta/recipes-support/libpcre/libpcre_8.12.bb b/meta/recipes-support/libpcre/libpcre_8.12.bb
index 9216777..24d91c3 100644
--- a/meta/recipes-support/libpcre/libpcre_8.12.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.12.bb
@@ -30,11 +30,11 @@  EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10
 do_compile () {
 	# stop libtool from trying to link with host libraries - fix from #33
 	# this resolve build problem on amd64 - #1015
-	if [ -e ${S}/${TARGET_SYS}-libtool ] ; then
-		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+	if [ -e ${S}/${HOST_SYS}-libtool ] ; then
+		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool
 	else
-		ln -sf ${S}/libtool ${S}/${TARGET_SYS}-libtool
-		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool	
+		ln -sf ${S}/libtool ${S}/${HOST_SYS}-libtool
+		sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool
 	fi
 
 	# The generation of dftables can lead to timestamp problems with ccache