[oe] [meta-networking][PATCH v2 2/2] meta-networking: override SECURITY_CFLAGS for c-ares

[Andre McCurdy]

On Mon, Jul 18, 2016 at 1:16 AM, Khem Raj <raj.khem at gmail.com> wrote:
> On Mon, Jul 18, 2016 at 1:03 AM <git at andred.net> wrote:
>
>> From: André Draszik <adraszik at tycoint.com>
>>
>> c-ares doesn't build if the distro has enabled usage of the
>> security_flags.inc file as it is picky about what is placed
>> into CPPFLAGS and CFLAGS. It complains and errors out if any
>> preprocessor options appear in CFLAGS.

Curl (on which c-ares's configure files seem to be based) used to have
the same problem but was fixed upstream by:

  https://github.com/curl/curl/commit/5d3cbde72ece7d83c280492957a26e26ab4e5cca

>> Fix this by providing an additional include file that is
>> require'd from conf/layer.conf which for c-ares moves the
>> defines added by security_flags.inc from CFLAGS to CPPFLAGS.
>>
>> Signed-off-by: André Draszik <adraszik at tycoint.com>
>> ---
>>  .../conf/distro/include/meta_networking_security_flags.inc          | 6
>> ++++++
>>  meta-networking/conf/layer.conf                                     | 3
>> +++
>>  2 files changed, 9 insertions(+)
>>  create mode 100644
>> meta-networking/conf/distro/include/meta_networking_security_flags.inc
>>
>> diff --git
>> a/meta-networking/conf/distro/include/meta_networking_security_flags.inc
>> b/meta-networking/conf/distro/include/meta_networking_security_flags.inc
>> new file mode 100644
>> index 0000000..06802d6
>> --- /dev/null
>> +++
>> b/meta-networking/conf/distro/include/meta_networking_security_flags.inc
>> @@ -0,0 +1,6 @@
>> +# configure righteously complains:
>> +# | 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.
>> +TARGET_CFLAGS_remove_pn-c-ares = "${lcl_maybe_fortify}"
>> +TARGET_CPPFLAGS_append_pn-c-ares = "${lcl_maybe_fortify}"
>>
>
> will
>
> lcl_maybe_fortify_pn-c-area = ""
>
> work ?
>
>
>> diff --git a/meta-networking/conf/layer.conf
>> b/meta-networking/conf/layer.conf
>> index 5fd636a..c09ba4a 100644
>> --- a/meta-networking/conf/layer.conf
>> +++ b/meta-networking/conf/layer.conf
>> @@ -21,3 +21,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
>>
>>  # used by waf-samba.bbclass
>>  WAF_CROSS_ANSWERS_PATH = "${LAYERDIR}/files/waf-cross-answers"
>> +
>> +# Override security flags
>> +require conf/distro/include/meta_networking_security_flags.inc
>> --
>> 2.8.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel