summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2011-11-16 14:17:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-18 10:47:14 +0000
commit49513a67ea8985eceb514cd2daffac3535778a48 (patch)
treeb616fbdd4b43f35fb865cd9f9879b4a22d40d7ac
parent78c61eda76fbff8bb11494d1f0275370e3c3ce26 (diff)
downloadpoky-49513a67ea8985eceb514cd2daffac3535778a48.tar.gz
bitbake.conf: add a couple explicit vardeps
(From OE-Core rev: 5b9877aa55e28ba06410592350e7e5106ebdf6cb) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 442fd4693c..01f064cbc6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -502,6 +502,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types"
502FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}" 502FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
503DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe" 503DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe"
504SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}" 504SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}"
505SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION"
505BUILD_OPTIMIZATION = "-O2 -pipe" 506BUILD_OPTIMIZATION = "-O2 -pipe"
506 507
507################################################################## 508##################################################################
@@ -713,7 +714,7 @@ COMBINED_FEATURES = "\
713 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ 714 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
714 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ 715 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \
715 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" 716 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
716 717COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
717 718
718# Make sure MACHINE isn't exported 719# Make sure MACHINE isn't exported
719# (breaks binutils at least) 720# (breaks binutils at least)