mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiarch DISTRO_FEATURE

Browse Source 
Make get_gcc_multiarch_setting more elegant. Use a dictionnary
to store the config options and replace bb.data.getVar with d.getVar.
Remove i686 from the architecture list because it doesn't seem
to be a valid TARGET_ARCH any more in OE.
Configure gdb (gdb and gdb-cross) with --enable-64-bit-bfd if
multiarch DISTRO_FEATURE is present

(From OE-Core rev: 0b42b2fc118bef8ce0d1473b146673182f5d1f78)

Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Julian Pidancet
2011-12-01 00:01:56 +00:00
committed by Richard Purdie
parent f340e3937f
commit a4b7188efd
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/recipes-devtools/gcc/gcc-common.inc
View File

@@ -22,13 +22,16 @@ def get_gcc_mips_plt_setting(bb, d):
return ""
def get_gcc_multiarch_setting(bb, d):
if 'multiarch' in bb.data.getVar('DISTRO_FEATURES',d,1).split() :
if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'i586', 'i686' ] :
return "--enable-targets=all"
if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'powerpc' ] :
return "--enable-targets=powerpc64"
if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'sparc' ] :
return "--enable-targets=all"
target_arch = d.getVar('TARGET_ARCH', True)
multiarch_options = {
"i586": "--enable-targets=all",
"powerpc": "--enable-targets=powerpc64",
"sparc": "--enable-targets=all",
}
if 'multiarch' in d.getVar('DISTRO_FEATURES', True).split() :
if target_arch in multiarch_options :
return multiarch_options[target_arch]
return ""
# We really need HOST_SYS here for some packages and TARGET_SYS for others.

1
meta/recipes-devtools/gdb/gdb-common.inc
View File

@@ -41,6 +41,7 @@ EXPAT = "--without-expat"
EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
--with-curses --disable-multilib --with-system-readline --disable-sim \
${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \
${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \
"
GDBPROPREFIX = "--program-prefix=''"