diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-18 22:31:29 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-19 22:15:39 +0100 |
commit | 7a4361c506ac24bafcf294f498d00278f11c3bd4 (patch) | |
tree | 56bbceaba0356a4e447fcdc63d4d35a542629749 /meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch | |
parent | 05a67104676e192e959150eb49902bed82681545 (diff) | |
download | poky-7a4361c506ac24bafcf294f498d00278f11c3bd4.tar.gz |
openssl10: rename back to openssl and make it the default via PREFERRED_VERSION
openssl 1.1 broke 3rd party layers a lot more than was expected; let's flip
the switch at the start of next development cycle.
Add a PROVIDES = "openssl10" to openssl 1.0 recipe; any dependency that is
not compatible with 1.1 should use that in its DEPENDS, as the 1.0
recipe will later be renamed back to openssl10. This does not always work:
http://lists.openembedded.org/pipermail/openembedded-core/2017-August/140957.html
but for many recipes it does.
(From OE-Core rev: 5585103c195104e85ed7ac1455bef91b2e88a04d)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch new file mode 100644 index 0000000000..f357b3f59f --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Add musl triplet support | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Index: 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,4 +504,6 @@ 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-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)", | ||
22 | +"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)", | ||
23 | |||
24 | "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).", | ||
25 | |||