aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2012-01-12 17:30:21 +0100
committerAndreas Oberritter <obi@opendreambox.org>2014-07-11 12:50:19 +0200
commit34a09dde0080bfb0e49299296de6c1a93d27b414 (patch)
tree358c62e3af1b97244accc5d016c08c9f84f7a000
parent54d50afd5226efea2295adf1fe0c13d056ee6e68 (diff)
downloadopenembedded-core-contrib-34a09dde0080bfb0e49299296de6c1a93d27b414.tar.gz
openssl: build always with -Wa,--noexecstack
There is no reason to disable exec-stack only for -native builds; binaries on the target will suffer from the same SELinux ACLs. OpenSSL does not use executable stack so this option can be disabled unconditionally. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 9c32b62d6494139daf4bab3279779c392fead116) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Conflicts: meta/recipes-connectivity/openssl/openssl.inc
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index c9759cd872..a56b61cb90 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -17,12 +17,10 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
S = "${WORKDIR}/openssl-${PV}"
AR_append = " r"
+# Avoid binaries being marked as requiring an executable stack since it
+# doesn't(which causes and this causes issues with SELinux
CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
- -DTERMIO ${CFLAGS} -Wall"
-
-# Avoid binaries being marked as requiring an executable stack (which causes
-# issues with SELinux on the host)
-CFLAG_append_virtclass-native = " -Wa,--noexecstack"
+ -DTERMIO ${CFLAGS} -Wall -Wa,--noexecstack"
# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"