Without this it breaks builds which don't include
conf/distro/include/security_flags.inc
with:
lcl_maybe_fortify = 
"${@base_conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}"

because then lcl_maybe_fortify isn't defined and gcc in c-ares
do_configure gets it unexpaned and fails:

configure:3926: checking whether the C compiler works
configure:3948: arm-oe-linux-gnueabi-gcc -march=armv7-a -mthumb -mfpu=neon 
-mfloat-abi=softfp -mcpu=cortex-a9 -mtune=cortex-a9 -funwind-tables -rdynamic 
-Os
--sysroot=/OE/sysroots/MACHINE -O2 -pipe -g -feliminate-unused-debug-types
-fdebug-prefix-map=/OE/work/MACHINE-oe-linux-gnueabi/c-ares/1.10.0-r0=/usr/src/debug/c-ares/1.10.0-r0
 -fdebug-prefix-map=/OE/sysroots/x86_64-linux=
-fdebug-prefix-map=/OE/sysroots/MACHINE= -Os ${lcl_maybe_fortify} -Wl,-O1 
-Wl,--hash-style=gnu -Wl,--as-needed conftest.c  >&5
arm-oe-linux-gnueabi-gcc: error: ${lcl_maybe_fortify}: No such file or directory

Signed-off-by: Martin Jansa <[email protected]>
---
 .../conf/distro/include/meta_networking_security_flags.inc            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/meta-networking/conf/distro/include/meta_networking_security_flags.inc 
b/meta-networking/conf/distro/include/meta_networking_security_flags.inc
index 06802d6..19e13ea 100644
--- a/meta-networking/conf/distro/include/meta_networking_security_flags.inc
+++ b/meta-networking/conf/distro/include/meta_networking_security_flags.inc
@@ -2,5 +2,9 @@
 # | configure:3479: using CFLAGS:  -O2 -pipe -g -feliminate-unused-debug-types 
-fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2
 # | configure:3485: CFLAGS error: CFLAGS may only be used to specify C 
compiler flags, not macro definitions. Use CPPFLAGS for: -D_FORTIFY_SOURCE=2
 # | configure:3516: error: Can not continue. Fix errors mentioned immediately 
above this line.
+
+# Make sure it's at least empty in builds which don't include
+# conf/distro/include/security_flags.inc
+lcl_maybe_fortify ?= ""
 TARGET_CFLAGS_remove_pn-c-ares = "${lcl_maybe_fortify}"
 TARGET_CPPFLAGS_append_pn-c-ares = "${lcl_maybe_fortify}"
-- 
2.9.2

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Reply via email to