diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-02-06 08:35:27 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-08 00:50:22 +0000 |
| commit | c54070c0b1fb4de00b4543c498c7c7079b526dcb (patch) | |
| tree | 1cb44b6ca574f65d8329751afd1c70a1d998ed65 /meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch | |
| parent | 4825e2af65560482217cdfd9f391c34040d4db85 (diff) | |
| download | poky-c54070c0b1fb4de00b4543c498c7c7079b526dcb.tar.gz | |
openssl-0.9.8: Remove in favor or 1.0.0
Now that Openssl 1.0.0 has been out for a while, there is no need to
keep multiple versions.
(From OE-Core rev: 6017251a1de93ff3d509a040a220e30d0ee9cd5e)
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-0.9.8t/shared-libs.patch')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch deleted file mode 100644 index 19de11243a..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch +++ /dev/null | |||
| @@ -1,50 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | diff --git a/Makefile.org b/Makefile.org | ||
| 4 | index e87d623..25ff367 100644 | ||
| 5 | --- a/Makefile.org | ||
| 6 | +++ b/Makefile.org | ||
| 7 | @@ -355,7 +355,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS) | ||
| 8 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
| 9 | if [ "$(FIPSCANLIB)" = "libfips" ]; then \ | ||
| 10 | $(ARD) libcrypto.a fipscanister.o ; \ | ||
| 11 | - $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \ | ||
| 12 | + $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \ | ||
| 13 | $(AR) libcrypto.a fips/fipscanister.o ; \ | ||
| 14 | else \ | ||
| 15 | if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ | ||
| 16 | @@ -373,7 +373,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a | ||
| 17 | @if [ "$(SHLIB_TARGET)" != "" ]; then \ | ||
| 18 | shlibdeps=-lcrypto; \ | ||
| 19 | [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \ | ||
| 20 | - $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \ | ||
| 21 | + $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \ | ||
| 22 | else \ | ||
| 23 | echo "There's no support for shared libraries on this platform" >&2 ; \ | ||
| 24 | exit 1; \ | ||
| 25 | diff --git a/crypto/Makefile b/crypto/Makefile | ||
| 26 | index 6557f2b..a69bf7c 100644 | ||
| 27 | --- a/crypto/Makefile | ||
| 28 | +++ b/crypto/Makefile | ||
| 29 | @@ -103,7 +103,7 @@ $(LIB): $(LIBOBJ) | ||
| 30 | |||
| 31 | shared: buildinf.h lib subdirs | ||
| 32 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
| 33 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
| 34 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
| 35 | fi | ||
| 36 | |||
| 37 | libs: | ||
| 38 | diff --git a/ssl/Makefile b/ssl/Makefile | ||
| 39 | index 5ac3507..77ea2bd 100644 | ||
| 40 | --- a/ssl/Makefile | ||
| 41 | +++ b/ssl/Makefile | ||
| 42 | @@ -62,7 +62,7 @@ lib: $(LIBOBJ) | ||
| 43 | |||
| 44 | shared: lib | ||
| 45 | if [ -n "$(SHARED_LIBS)" ]; then \ | ||
| 46 | - (cd ..; $(MAKE) $(SHARED_LIB)); \ | ||
| 47 | + (cd ..; $(MAKE) -e $(SHARED_LIB)); \ | ||
| 48 | fi | ||
| 49 | |||
| 50 | files: | ||
