Patchwork [03/10] binutils: fixes for build with an external csl toolchain

login
register
mail settings
Submitter Christopher Larson
Date Jan. 27, 2012, 5:13 p.m.
Message ID <a36fa8d970d1a2eceb16774604e5b5b7aff0b2cb.1327684024.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/20235/
State Accepted
Commit 050eb9c82d8a2d04f2578c04a826b7762d737446
Headers show

Comments

Christopher Larson - Jan. 27, 2012, 5:13 p.m.
From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/recipes-devtools/binutils/binutils.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Khem Raj - Jan. 28, 2012, 8:23 p.m.
On (27/01/12 11:13), Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
> 
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
>  meta/recipes-devtools/binutils/binutils.inc |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
> index 6130ab4..e343242 100644
> --- a/meta/recipes-devtools/binutils/binutils.inc
> +++ b/meta/recipes-devtools/binutils/binutils.inc
> @@ -51,6 +51,7 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
>  EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
>                  --enable-install-libbfd \
>                  --enable-shared \
> +                --disable-werror \

I specifically wanted to avoid this option but I guess we have to have
it to support wide versions of gcc.

>                  ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
>  
>  EXTRA_OECONF_virtclass-native = "--enable-target=all --enable-64-bit-bfd --enable-install-libbfd"
> @@ -113,11 +114,11 @@ do_install () {
>  	cd ${D}${bindir}
>  
>  	# Symlinks for ease of running these on the native target
> -	for p in ${TARGET_SYS}-* ; do
> +	for p in ${TARGET_PREFIX}* ; do
>  		ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,`
>  	done
>  
> -	rm ${D}${bindir}/ar ${D}${bindir}/strings
> +	rm -f ${D}${bindir}/ar ${D}${bindir}/strings
>  
>  	oe_multilib_header bfd.h
>  }
> -- 
> 1.7.8.rc4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Chris Larson - Feb. 2, 2012, 6:25 p.m.
On Sat, Jan 28, 2012 at 1:23 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On (27/01/12 11:13), Christopher Larson wrote:
>> From: Christopher Larson <chris_larson@mentor.com>
>>
>> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>> ---
>>  meta/recipes-devtools/binutils/binutils.inc |    5 +++--
>>  1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
>> index 6130ab4..e343242 100644
>> --- a/meta/recipes-devtools/binutils/binutils.inc
>> +++ b/meta/recipes-devtools/binutils/binutils.inc
>> @@ -51,6 +51,7 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
>>  EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
>>                  --enable-install-libbfd \
>>                  --enable-shared \
>> +                --disable-werror \
>
> I specifically wanted to avoid this option but I guess we have to have
> it to support wide versions of gcc.

Yeah, it'd be nice if it wasn't needed, but sadly it is for some.

Patch

diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 6130ab4..e343242 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -51,6 +51,7 @@  B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
                 --enable-install-libbfd \
                 --enable-shared \
+                --disable-werror \
                 ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
 
 EXTRA_OECONF_virtclass-native = "--enable-target=all --enable-64-bit-bfd --enable-install-libbfd"
@@ -113,11 +114,11 @@  do_install () {
 	cd ${D}${bindir}
 
 	# Symlinks for ease of running these on the native target
-	for p in ${TARGET_SYS}-* ; do
+	for p in ${TARGET_PREFIX}* ; do
 		ln -sf $p `echo $p | sed -e s,${TARGET_PREFIX},,`
 	done
 
-	rm ${D}${bindir}/ar ${D}${bindir}/strings
+	rm -f ${D}${bindir}/ar ${D}${bindir}/strings
 
 	oe_multilib_header bfd.h
 }