From: Andre McCurdy Date: Thu, 14 Jan 2016 03:35:09 +0000 (-0800) Subject: security_flags.inc: remove obsolete workarounds for curl X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~27613 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0dfd7bf9b2d6fb269f4d9b62263fd7ccc805fde;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git security_flags.inc: remove obsolete workarounds for curl The curl configure script contains sanity checks for unexpected options being passed via CFLAGS, LDFLAGS, etc. environment variables. These sanity checks catch -Dxxx options in CFLAGS, which clashes with OE's approach of using CFLAGS to pass -D_FORTIFY_SOURCE (curl's configure script suggests, quite correctly, that -Dxxx options should be passed via CPPFLAGS instead). These sanity checks previously generated fatal errors, but have been downgraded to warnings since curl v7.32. Therefore the workaround of avoiding -D_FORTIFY_SOURCE for curl is obsolete and can be removed. https://github.com/bagder/curl/commit/5d3cbde72ece7d83c280492957a26e26ab4e5cca Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 1795750fb34..ac4fc65a6f1 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -28,11 +28,7 @@ SECURITY_CFLAGS_pn-aspell = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-beecrypt = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-blktrace = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-coreutils = "${SECURITY_NO_PIE_CFLAGS}" -# Curl seems to check for FORTIFY_SOURCE in CFLAGS, but even assigned -# to CPPFLAGS it gets picked into CFLAGS in bitbake. -#TARGET_CPPFLAGS_pn-curl += "-D_FORTIFY_SOURCE=2" SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-curl = "-fstack-protector-all -pie -fpie" SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-glibc = ""