[oe-commits] org.oe.dev openssl_0.9.8g.bb: fix generation of shared libraries (use correct CC)

[jeremy_laine commit]

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

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 07638b4b82998b594ffb4858eaca86494159cda0
ViewMTN: http://monotone.openembedded.org/revision/info/07638b4b82998b594ffb4858eaca86494159cda0
Files:
1
packages/openssl/openssl-0.9.8g/shared-libs.patch
packages/openssl/openssl_0.9.8g.bb
Diffs:

#
# mt diff -r352a68daa258bd3812504d237366304d1a244e55 -r07638b4b82998b594ffb4858eaca86494159cda0
#
#
#
# add_file "packages/openssl/openssl-0.9.8g/shared-libs.patch"
#  content [efebd1280c4029b2988e094490e8c741aedca5ae]
# 
# patch "packages/openssl/openssl_0.9.8g.bb"
#  from [e326706f63f853e3243bfc002f2f8d924885404d]
#    to [e58b856f27d381cd8144f793ed62411811891dbd]
#
============================================================
--- packages/openssl/openssl-0.9.8g/shared-libs.patch	efebd1280c4029b2988e094490e8c741aedca5ae
+++ packages/openssl/openssl-0.9.8g/shared-libs.patch	efebd1280c4029b2988e094490e8c741aedca5ae
@@ -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:
============================================================
--- packages/openssl/openssl_0.9.8g.bb	e326706f63f853e3243bfc002f2f8d924885404d
+++ packages/openssl/openssl_0.9.8g.bb	e58b856f27d381cd8144f793ed62411811891dbd
@@ -2,9 +2,10 @@ require openssl.inc
 
 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 = ""