From 545986bfbfe20f2b6e8a46e88e2cc3007ca344e6 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 4 Mar 2014 14:51:03 -0800 Subject: security_flags: Update to correctly link X modules Remove the -z,now flag from linking [YOCTO #5885] Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/conf/distro/include/security_flags.inc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'meta/conf') diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index a871a3fe0f..fa604fd5a4 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -1,6 +1,7 @@ SECURITY_CFLAGS ?= "-fstack-protector-all -pie -fpie -D_FORTIFY_SOURCE=2" SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-all -D_FORTIFY_SOURCE=2" SECURITY_LDFLAGS ?= "-Wl,-z,relro,-z,now" +SECURITY_X_LDFLAGS ?= "-Wl,-z,relro" # powerpc does not get on with pie for reasons not looked into as yet SECURITY_CFLAGS_powerpc = "-fstack-protector-all -D_FORTIFY_SOURCE=2" @@ -72,3 +73,11 @@ SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}" TARGET_CFLAGS_append = " ${SECURITY_CFLAGS}" TARGET_LDFLAGS_append = " ${SECURITY_LDFLAGS}" + +SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-video-omap = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}" +SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" -- cgit 1.2.3-korg