diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-core/glibc/glibc.inc | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 7bae0e9554..823e60e771 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc | |||
@@ -10,13 +10,13 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | |||
10 | 10 | ||
11 | python () { | 11 | python () { |
12 | opt_effective = "-O" | 12 | opt_effective = "-O" |
13 | for opt in d.getVar('SELECTED_OPTIMIZATION', True).split(): | 13 | for opt in d.getVar('SELECTED_OPTIMIZATION').split(): |
14 | if opt in ("-O0", "-O", "-O1", "-O2", "-O3", "-Os"): | 14 | if opt in ("-O0", "-O", "-O1", "-O2", "-O3", "-Os"): |
15 | opt_effective = opt | 15 | opt_effective = opt |
16 | if opt_effective == "-O0": | 16 | if opt_effective == "-O0": |
17 | bb.fatal("%s can't be built with %s, try -O1 instead" % (d.getVar('PN', True), opt_effective)) | 17 | bb.fatal("%s can't be built with %s, try -O1 instead" % (d.getVar('PN'), opt_effective)) |
18 | if opt_effective in ("-O", "-O1", "-Os"): | 18 | if opt_effective in ("-O", "-O1", "-Os"): |
19 | bb.note("%s doesn't build cleanly with %s, adding -Wno-error to SELECTED_OPTIMIZATION" % (d.getVar('PN', True), opt_effective)) | 19 | bb.note("%s doesn't build cleanly with %s, adding -Wno-error to SELECTED_OPTIMIZATION" % (d.getVar('PN'), opt_effective)) |
20 | d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error") | 20 | d.appendVar("SELECTED_OPTIMIZATION", " -Wno-error") |
21 | } | 21 | } |
22 | 22 | ||