diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-11-19 01:03:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-12 23:42:55 +0000 |
commit | 33bab59f8e56617650879ea84ef7afd79830bef6 (patch) | |
tree | 9f6a181942c44cf50cc3d76a60b568790388ad6e /meta/recipes-connectivity/openssl/openssl.inc | |
parent | c4207ee4d9b1f4e49dec7f738459fcb7afd8b3b5 (diff) | |
download | poky-33bab59f8e56617650879ea84ef7afd79830bef6.tar.gz |
openssl: Add musl configuration support
use termios instead of termio
(From OE-Core rev: 753b6233e5da66d9e64952b8089589a1beebf8a9)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl.inc')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 429fc5e72c..199e9ab0d4 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -18,10 +18,12 @@ S = "${WORKDIR}/openssl-${PV}" | |||
18 | PACKAGECONFIG[perl] = ",,," | 18 | PACKAGECONFIG[perl] = ",,," |
19 | 19 | ||
20 | AR_append = " r" | 20 | AR_append = " r" |
21 | TERMIO_libc-musl = "-DTERMIOS" | ||
22 | TERMIO ?= "-DTERMIO" | ||
21 | # Avoid binaries being marked as requiring an executable stack since it | 23 | # Avoid binaries being marked as requiring an executable stack since it |
22 | # doesn't(which causes and this causes issues with SELinux | 24 | # doesn't(which causes and this causes issues with SELinux |
23 | CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ | 25 | CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ |
24 | -DTERMIO ${CFLAGS} -Wall -Wa,--noexecstack" | 26 | ${TERMIO} ${CFLAGS} -Wall -Wa,--noexecstack" |
25 | 27 | ||
26 | # -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom | 28 | # -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom |
27 | CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}" | 29 | CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}" |