diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-21 15:52:40 +0200 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-08-05 09:06:49 -0400 |
| commit | b2eae93d0ac9ea8e4c96687a3908242a718b4214 (patch) | |
| tree | e0c098caf79fb671b3635e7f68eb9adcbec10fef /meta-networking/conf | |
| parent | abf5445c1ae2f4f89fdc77b6194309d2c4588855 (diff) | |
| download | meta-openembedded-b2eae93d0ac9ea8e4c96687a3908242a718b4214.tar.gz | |
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@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/conf')
| -rw-r--r-- | meta-networking/conf/distro/include/meta_networking_security_flags.inc | 4 |
1 files changed, 4 insertions, 0 deletions
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 06802d66d9..19e13ea872 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}" |