From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Sat, 13 May 2017 09:00:34 +0000 (+0200)
Subject: Fix build of mozjs, gpm and libatasmart due to SECURITY_%FLAGS
X-Git-Tag: 3.99.1~25
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=7c227f30c8437d2f5a7b95622d97a86149a716c8;p=AGL%2Fmeta-agl.git

Fix build of mozjs, gpm and libatasmart due to SECURITY_%FLAGS

The three packages fail to build on at least 3 boards.
Move to the distro config for now and track investigation in
SPEC-593.

Bug-AGL: SPEC-593

Change-Id: I97d55b6b34ea18fae943ab6bd89c88088896f2ac
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9379
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
Reviewed-by: José Bollo <jobol@nonadev.net>
---

diff --git a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
index 195a11ea9..f3abe4cc5 100644
--- a/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
+++ b/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc
@@ -20,13 +20,6 @@ PREFERRED_PROVIDER_libgbm           = "libgbm"
 #Preferred versions
 PREFERRED_VERSION_libgbm            = "10.0.0"
 
-SECURITY_CFLAGS_pn-mozjs = ""
-SECURITY_LDFLAGS_pn-mozjs = ""
-SECURITY_CFLAGS_pn-gpm = ""
-SECURITY_LDFLAGS_pn-gpm = ""
-SECURITY_CFLAGS_pn-libatasmart = ""
-SECURITY_LDFLAGS_pn-libatasmart = ""
-
 #-------------------------------------------------
 ## Multimedia section ##
 #-------------------------------------------------
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 93e89afd9..a8cc2ca74 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -80,6 +80,15 @@ SECURITY_STRINGFORMAT_pn-gpm = ""
 SECURITY_CFLAGS_pn-libdbus-c++ = ""
 SECURITY_LDFLAGS_pn-libdbus-c++ = ""
 
+# more than 2 targets fail to compile these with the SECURITY compiler flags:
+# Bug tracked as SPEC-593
+SECURITY_CFLAGS_pn-mozjs = ""
+SECURITY_LDFLAGS_pn-mozjs = ""
+SECURITY_CFLAGS_pn-gpm = ""
+SECURITY_LDFLAGS_pn-gpm = ""
+SECURITY_CFLAGS_pn-libatasmart = ""
+SECURITY_LDFLAGS_pn-libatasmart = ""
+
 # Not yet upstreamed; should be submitted.
 SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"