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/openssl10/oe-ldflags.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/openssl10/oe-ldflags.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch deleted file mode 100644 index 292e13dc5f..0000000000 --- a/meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [open-embedded] | ||
2 | |||
3 | Index: openssl-1.0.0/Makefile.shared | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.0.orig/Makefile.shared | ||
6 | +++ openssl-1.0.0/Makefile.shared | ||
7 | @@ -92,7 +92,7 @@ | ||
8 | LINK_APP= \ | ||
9 | ( $(SET_X); \ | ||
10 | LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ | ||
11 | - LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ | ||
12 | + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$(OE_LDFLAGS) $${LDFLAGS:-$(CFLAGS)}"; \ | ||
13 | LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ | ||
14 | LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ | ||
15 | LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ | ||
16 | @@ -102,7 +102,7 @@ | ||
17 | ( $(SET_X); \ | ||
18 | LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \ | ||
19 | SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \ | ||
20 | - SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ | ||
21 | + SHAREDFLAGS="$(OE_LDFLAGS) $${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ | ||
22 | LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ | ||
23 | LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ | ||
24 | LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ | ||