[oe-commits] [meta-openembedded] 12/44: meta_networking_security_flags.inc: add weak assignment for lcl_maybe_fortify

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 00c076e7364cfcb8b9e86f34fbd3c7bda7d96561
Author: Martin Jansa <Martin.Jansa at gmail.com>
AuthorDate: Thu Jul 21 15:52:40 2016 +0200

    meta_networking_security_flags.inc: add weak assignment for lcl_maybe_fortify
    
    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 <Martin.Jansa at gmail.com>
---
 .../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}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.