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

[AGL/meta-agl.git] / meta-agl-distro / conf / distro / poky-agl.conf

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index e919e0a..a8cc2ca 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -55,13 +55,13 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 
 
 # Prefer GStreamer 1.8.x by default
-PREFERRED_VERSION_gstreamer1.0              ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-libav        ?= "1.8%"
-PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.8%"
+PREFERRED_VERSION_gstreamer1.0              ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-libav        ?= "1.8.%"
+PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.2.%"
 
 # Prefer libjpeg-turbo
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
@@ -74,12 +74,43 @@ PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
 require conf/distro/include/security_flags.inc
 # required overrides, upstreamed but not merged yet:
 # http://lists.openembedded.org/pipermail/openembedded-devel/2016-June/107727.html
-#SECURITY_CFLAGS_pn-llvm3.3 = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-llvm3.3 = ""
+SECURITY_LDFLAGS_remove_pn-llvm3.3 = "-fstack-protector-strong"
 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}"
+
 #Redefined USER_CLASSES
 #Disable prelink. It is unmaintained and likely will go away.
 #default: USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 USER_CLASSES = "buildstats image-mklibs"
+
+# AGL uses 4 optimization levels
+# 2 for ARM 32bit 
+#   - a high and a medium setting for the CCARGS
+#   - the high setting is default (needs >= cortex-a15)
+#   - the medium setting is enabled with: DISTRO_FEATURES_append = " agl-medium-arm-compiler "
+# 1 for ARM 64bit / AARCH64
+# 1 for x86-64
+require conf/distro/include/${TARGET_ARCH}-tune.inc
+
+# Generic qemu and qemuboot (runqemu) enhancements
+# check qemuboot.bbclass
+# - use 1G RAM by default
+QB_MEM ?= "-m 1024"
+
+# temporary fix for meta-updater (to be removed 2017-05-01)
+IMAGE_INSTALL_remove = "rvi-sota-client"
+