summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-11-19 01:03:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-12 23:42:55 +0000
commit33bab59f8e56617650879ea84ef7afd79830bef6 (patch)
tree9f6a181942c44cf50cc3d76a60b568790388ad6e
parentc4207ee4d9b1f4e49dec7f738459fcb7afd8b3b5 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc4
-rw-r--r--meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch27
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2e.bb1
3 files changed, 31 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}"
18PACKAGECONFIG[perl] = ",,," 18PACKAGECONFIG[perl] = ",,,"
19 19
20AR_append = " r" 20AR_append = " r"
21TERMIO_libc-musl = "-DTERMIOS"
22TERMIO ?= "-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
23CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ 25CFLAG = "${@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
27CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}" 29CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
diff --git a/meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch b/meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch
new file mode 100644
index 0000000000..613dc7b71c
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch
@@ -0,0 +1,27 @@
1Add musl triplet support
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Index: openssl-1.0.2a/Configure
7===================================================================
8--- openssl-1.0.2a.orig/Configure
9+++ openssl-1.0.2a/Configure
10@@ -431,7 +431,7 @@ my %table=(
11 #
12 # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8
13 #
14-"linux-armv4", "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
15+"linux-armv4", "gcc: -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
16 "linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
17 # Configure script adds minimally required -march for assembly support,
18 # if no -march was specified at command line. mips32 and mips64 below
19@@ -504,6 +504,8 @@ my %table=(
20 "linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
21 "linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
22 "linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
23+"linux-musleabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
24+"linux-musleabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
25
26 "linux-avr32","$ENV{'CC'}:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
27
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2e.bb
index e41f46b10c..c4e590f760 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2e.bb
@@ -37,6 +37,7 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
37 file://crypto_use_bigint_in_x86-64_perl.patch \ 37 file://crypto_use_bigint_in_x86-64_perl.patch \
38 file://openssl-1.0.2a-x32-asm.patch \ 38 file://openssl-1.0.2a-x32-asm.patch \
39 file://ptest_makefile_deps.patch \ 39 file://ptest_makefile_deps.patch \
40 file://configure-musl-target.patch \
40 " 41 "
41 42
42SRC_URI[md5sum] = "5262bfa25b60ed9de9f28d5d52d77fc5" 43SRC_URI[md5sum] = "5262bfa25b60ed9de9f28d5d52d77fc5"