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/oe-ldflags.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/oe-ldflags.patch')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl/oe-ldflags.patch deleted file mode 100644 index 292e13dc5f..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/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 \ | ||