diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-11-28 14:18:37 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:15:06 +0000 |
commit | c2265d0cd59b24d7a364ab7ffc7d6a9755cd83d2 (patch) | |
tree | 3a8c352036651fbb9579fdd9210f5628bb78cd89 /meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch | |
parent | f73462cdb746afc1bf95b91422315cda62dfdcd1 (diff) | |
download | poky-c2265d0cd59b24d7a364ab7ffc7d6a9755cd83d2.tar.gz |
openssl: Add openssl 1.0
* Thanks to meta-oe for this contribution
* Add Patch Upstream-Status info
* Merged the meta-oe version of openssl-1.0.inc with openssl.inc
* Fix make install parallel issue with PARALLEL_MAKEINST = ""
(From OE-Core rev: ee3ed78af2303ad41993ed34fa7825a74de288c7)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch new file mode 100644 index 0000000000..292e13dc5f --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch | |||
@@ -0,0 +1,24 @@ | |||
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 \ | ||