summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gcc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-09 15:00:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:51:19 (GMT)
commitc8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch)
tree5f1b86954646a0f3bb914407994388a6a4346769 /meta/recipes-devtools/gcc
parent5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff)
downloadpoky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.tar.gz
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc8
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc2
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index f83f4da..69e0213 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -7,17 +7,17 @@ NATIVEDEPS = ""
7 7
8inherit autotools gettext 8inherit autotools gettext
9 9
10FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" 10FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/gcc-${PV}"
11 11
12def get_gcc_fpu_setting(bb, d): 12def get_gcc_fpu_setting(bb, d):
13 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: 13 if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
14 return "--with-float=soft" 14 return "--with-float=soft"
15 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'ppc-efd' ]: 15 if d.getVar('TARGET_FPU', 1) in [ 'ppc-efd' ]:
16 return "--enable-e500_double" 16 return "--enable-e500_double"
17 return "" 17 return ""
18 18
19def get_gcc_mips_plt_setting(bb, d): 19def get_gcc_mips_plt_setting(bb, d):
20 if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'mips', 'mipsel' ] and 'mplt' in bb.data.getVar('DISTRO_FEATURES',d,1).split() : 20 if d.getVar('TARGET_ARCH', 1) in [ 'mips', 'mipsel' ] and 'mplt' in d.getVar('DISTRO_FEATURES',1).split() :
21 return "--with-mips-plt" 21 return "--with-mips-plt"
22 return "" 22 return ""
23 23
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 2ddc3d7..ae23e8e 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -27,7 +27,7 @@ EXTRA_OECONF_INTERMEDIATE ?= ""
27 27
28GCCMULTILIB = "--disable-multilib" 28GCCMULTILIB = "--disable-multilib"
29 29
30EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ 30EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', 1) != 'no']} \
31 --with-gnu-ld \ 31 --with-gnu-ld \
32 --enable-shared \ 32 --enable-shared \
33 --enable-languages=${LANGUAGES} \ 33 --enable-languages=${LANGUAGES} \