summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-02-22 06:50:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-22 20:42:48 +0000
commit23056103c949b498c23b47579e8dd57ce78e6ed9 (patch)
tree81bd4166f54317d347df4c66f33f7f40e050b6fe
parentaab39005b31b428ae5cb05a34cb26809ab521cc4 (diff)
downloadpoky-23056103c949b498c23b47579e8dd57ce78e6ed9.tar.gz
uclibc: Do not use immediate expansion operator
:= causes none of _remove flags to work with uclibc e.g. security flags where we remove ssp options for libcs but it does not become effective for uclibc and hence the build fails (From OE-Core rev: 205b446f3fc4a9885179a66a8dab9d81bcc63dca) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index b63158ac40..1d42284fb7 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -63,7 +63,7 @@ export V="2"
63# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44860 63# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44860
64# 64#
65CFLAGS_remove_arm = "-fno-omit-frame-pointer" 65CFLAGS_remove_arm = "-fno-omit-frame-pointer"
66UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}" 66UCLIBC_EXTRA_CFLAGS = "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}"
67 67
68configmangle = '/^KERNEL_HEADERS/d; \ 68configmangle = '/^KERNEL_HEADERS/d; \
69 /^RUNTIME_PREFIX/d; \ 69 /^RUNTIME_PREFIX/d; \
@@ -82,8 +82,8 @@ configmangle = '/^KERNEL_HEADERS/d; \
82 /HAS_FPU/d; \ 82 /HAS_FPU/d; \
83 ${@["","s,.*MULTILIB_DIR.*,MULTILIB_DIR=\"${baselib}\",;"][d.getVar("baselib", True) != "lib"]} \ 83 ${@["","s,.*MULTILIB_DIR.*,MULTILIB_DIR=\"${baselib}\",;"][d.getVar("baselib", True) != "lib"]} \
84 ' 84 '
85OE_FEATURES := "${@features_to_uclibc_conf(d)}" 85OE_FEATURES = "${@features_to_uclibc_conf(d)}"
86OE_DEL := "${@features_to_uclibc_del(d)}" 86OE_DEL = "${@features_to_uclibc_del(d)}"
87python () { 87python () {
88 if "${OE_DEL}": 88 if "${OE_DEL}":
89 d.setVar('configmangle_append', "${OE_DEL}" + "\n") 89 d.setVar('configmangle_append', "${OE_DEL}" + "\n")