diff options
| author | Jeremy Laine <jeremy.laine@m4x.org> | 2008-05-12 13:38:18 +0000 |
|---|---|---|
| committer | Jeremy Laine <jeremy.laine@m4x.org> | 2008-05-12 13:38:18 +0000 |
| commit | 4eb5cc652629a0d77c666d171c66a6e3c8de4c86 (patch) | |
| tree | 48c285da5bcd29b3609039dd64630cb48bd82271 /packages | |
| parent | 563b7f68d00564f31e1e1154639af3072198a481 (diff) | |
openssl_0.9.8g.bb: fix generation of shared libraries (use correct CC)
* while building the shared versions of libcrypto and libssl, the environment
variables were lost, so we ended up using the wrong CC for linking
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/openssl/openssl-0.9.8g/shared-libs.patch | 45 | ||||
| -rw-r--r-- | packages/openssl/openssl_0.9.8g.bb | 5 |
2 files changed, 48 insertions, 2 deletions
diff --git a/packages/openssl/openssl-0.9.8g/shared-libs.patch b/packages/openssl/openssl-0.9.8g/shared-libs.patch new file mode 100644 index 0000000000..db98582443 --- /dev/null +++ b/packages/openssl/openssl-0.9.8g/shared-libs.patch @@ -0,0 +1,45 @@ +diff -urN openssl-0.9.8g.orig/crypto/Makefile openssl-0.9.8g/crypto/Makefile +--- openssl-0.9.8g.orig/crypto/Makefile 2006-02-04 02:48:41.000000000 +0100 ++++ openssl-0.9.8g/crypto/Makefile 2008-05-12 15:17:03.000000000 +0200 +@@ -103,7 +103,7 @@ + + shared: buildinf.h lib subdirs + if [ -n "$(SHARED_LIBS)" ]; then \ +- (cd ..; $(MAKE) $(SHARED_LIB)); \ ++ (cd ..; $(MAKE) -e $(SHARED_LIB)); \ + fi + + libs: +diff -urN openssl-0.9.8g.orig/Makefile.org openssl-0.9.8g/Makefile.org +--- openssl-0.9.8g.orig/Makefile.org 2007-04-24 01:49:54.000000000 +0200 ++++ openssl-0.9.8g/Makefile.org 2008-05-12 15:16:34.000000000 +0200 +@@ -246,7 +246,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; \ +@@ -254,7 +254,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; \ +diff -urN openssl-0.9.8g.orig/ssl/Makefile openssl-0.9.8g/ssl/Makefile +--- openssl-0.9.8g.orig/ssl/Makefile 2007-10-11 16:36:59.000000000 +0200 ++++ openssl-0.9.8g/ssl/Makefile 2008-05-12 15:17:26.000000000 +0200 +@@ -62,7 +62,7 @@ + + shared: lib + if [ -n "$(SHARED_LIBS)" ]; then \ +- (cd ..; $(MAKE) $(SHARED_LIB)); \ ++ (cd ..; $(MAKE) -e $(SHARED_LIB)); \ + fi + + files: diff --git a/packages/openssl/openssl_0.9.8g.bb b/packages/openssl/openssl_0.9.8g.bb index 622fd2e9c9..133283f0f8 100644 --- a/packages/openssl/openssl_0.9.8g.bb +++ b/packages/openssl/openssl_0.9.8g.bb @@ -2,9 +2,10 @@ inherit pkgconfig require openssl.inc -PR = "r6" +PR = "r7" SRC_URI += "file://debian.patch;patch=1 \ - file://configure-targets.patch;patch=1" + file://configure-targets.patch;patch=1 \ + file://shared-libs.patch;patch=1" PARALLEL_MAKE = "" |