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/shared-libs.patch | |
parent | f73462cdb746afc1bf95b91422315cda62dfdcd1 (diff) | |
download | ast2050-yocto-poky-c2265d0cd59b24d7a364ab7ffc7d6a9755cd83d2.zip ast2050-yocto-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/shared-libs.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch new file mode 100644 index 0000000..0998673 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch @@ -0,0 +1,50 @@ +Upstream-Status: Inappropriate [configuration] + +Index: openssl-1.0.0/crypto/Makefile +=================================================================== +--- openssl-1.0.0.orig/crypto/Makefile ++++ openssl-1.0.0/crypto/Makefile +@@ -104,7 +104,7 @@ + + shared: buildinf.h lib subdirs + if [ -n "$(SHARED_LIBS)" ]; then \ +- (cd ..; $(MAKE) $(SHARED_LIB)); \ ++ (cd ..; $(MAKE) -e $(SHARED_LIB)); \ + fi + + libs: +Index: openssl-1.0.0/Makefile.org +=================================================================== +--- openssl-1.0.0.orig/Makefile.org ++++ openssl-1.0.0/Makefile.org +@@ -260,7 +260,7 @@ + + libcrypto$(SHLIB_EXT): libcrypto.a + @if [ "$(SHLIB_TARGET)" != "" ]; then \ +- $(MAKE) SHLIBDIRS=crypto build-shared; \ ++ $(MAKE) -e SHLIBDIRS=crypto build-shared; \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + exit 1; \ +@@ -268,7 +268,7 @@ + + libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a + @if [ "$(SHLIB_TARGET)" != "" ]; then \ +- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ ++ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \ + else \ + echo "There's no support for shared libraries on this platform" >&2; \ + exit 1; \ +Index: openssl-1.0.0/ssl/Makefile +=================================================================== +--- openssl-1.0.0.orig/ssl/Makefile ++++ openssl-1.0.0/ssl/Makefile +@@ -62,7 +62,7 @@ + + shared: lib + if [ -n "$(SHARED_LIBS)" ]; then \ +- (cd ..; $(MAKE) $(SHARED_LIB)); \ ++ (cd ..; $(MAKE) -e $(SHARED_LIB)); \ + fi + + files: |