diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-08 18:30:48 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-13 09:27:38 +0100 |
commit | e326733d69181a03af7a4f837ea78fce348fdf00 (patch) | |
tree | f2b049b04bf94693ad017ac68df139b4ed655c65 /meta/recipes-connectivity/openssl/openssl/shared-libs.patch | |
parent | 04891b31e62f37e692647399fa3534d3dd4ab7f9 (diff) | |
download | poky-e326733d69181a03af7a4f837ea78fce348fdf00.tar.gz |
openssl: add a 1.1 version
Existing openssl 1.0 recipe is renamed to openssl10; it will
continue to be provided for as long as upstream supports it
(and there are still several recipes which do not work with openssl
1.1 due to API differences).
A few files (such as openssl binary) are no longer installed by openssl 1.0,
because they clash with openssl 1.1.
(From OE-Core rev: da1183f9fa5e06fbe66b5b31eb3313d5d35d11e3)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.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/shared-libs.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/shared-libs.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl/shared-libs.patch deleted file mode 100644 index a7ca0a3078..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/shared-libs.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: openssl-1.0.1e/crypto/Makefile | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.1e.orig/crypto/Makefile | ||
6 | +++ openssl-1.0.1e/crypto/Makefile | ||
7 | @@ -108,7 +108,7 @@ $(LIB): $(LIBOBJ) | ||
8 | |||
9 | shared: buildinf.h lib subdirs | ||
10 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
11 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
12 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
13 | fi | ||
14 | |||
15 | libs: | ||
16 | Index: openssl-1.0.1e/Makefile.org | ||
17 | =================================================================== | ||
18 | --- openssl-1.0.1e.orig/Makefile.org | ||
19 | +++ openssl-1.0.1e/Makefile.org | ||
20 | @@ -310,7 +310,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_ | ||
21 | |||
22 | libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a | ||
23 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
24 | - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ | ||
25 | + $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ | ||
26 | else \ | ||
27 | echo "There's no support for shared libraries on this platform" >&2; \ | ||
28 | exit 1; \ | ||
29 | Index: openssl-1.0.1e/ssl/Makefile | ||
30 | =================================================================== | ||
31 | --- openssl-1.0.1e.orig/ssl/Makefile | ||
32 | +++ openssl-1.0.1e/ssl/Makefile | ||
33 | @@ -62,7 +62,7 @@ lib: $(LIBOBJ) | ||
34 | |||
35 | shared: lib | ||
36 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
37 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
38 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
39 | fi | ||
40 | |||
41 | files: | ||