[oe-commits] org.oe.dev merge of '07638b4b82998b594ffb4858eaca86494159cda0'

[jeremy_laine commit]

merge of '07638b4b82998b594ffb4858eaca86494159cda0'
     and '1019be7986524fea8a63da6199f04430a64cd018'

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

#
# mt diff -r07638b4b82998b594ffb4858eaca86494159cda0 -r84b4229101bdb9c0dd01734754cf64308c35e2b7
#
#
#
# patch "classes/autotools.bbclass"
#  from [77ba9664d4d26f5edd362d75ede90780a2f3c741]
#    to [3acb6dbe08d32ccda69ed2a8b6a695611888de97]
#
============================================================
--- classes/autotools.bbclass	77ba9664d4d26f5edd362d75ede90780a2f3c741
+++ classes/autotools.bbclass	3acb6dbe08d32ccda69ed2a8b6a695611888de97
@@ -58,7 +58,6 @@ oe_runconf () {
 		    --oldincludedir=${oldincludedir} \
 		    --infodir=${infodir} \
 		    --mandir=${mandir} \
-                                --enable-mainainer-mode \
 			${EXTRA_OECONF} \
 		    $@"
 		oenote "Running $cfgcmd..."
@@ -172,7 +171,7 @@ autotools_stage_dir() {
 	rmdir "$from" 2> /dev/null || true
 	if [ -d "$from" ]; then
 		mkdir -p "$to"
-		cp -fpPR -t "$to" "$from"/*
+		cp -fpPR "$from"/* "$to"
 	fi
 }
 
@@ -199,21 +198,14 @@ autotools_stage_all() {
 		las=$(find . -name \*.la -type f)
 		cd $olddir
 		echo "Found la files: $las"		 
-		if [ -n "$las" ]; then
-			# If there are .la files then libtool was used in the
-			# build, so install them with magic mangling.
-			for i in $las
-			do
-				dir=$(dirname $i)
-				echo "oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}"
-				oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}
-			done
-		else
-			# Otherwise libtool wasn't used, and lib/ can be copied
-			# directly.
-      autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
-		fi
-	
+		for i in $las
+		do
+			sed -e 's/^installed=yes$/installed=no/' \
+			    -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+			    -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
+			    -i ${STAGE_TEMP}/${libdir}/$i
+		done
+		autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
 	fi
 	# Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files,
 	# however some packages rely on the presence of .pc files to enable/disable


#
# mt diff -r1019be7986524fea8a63da6199f04430a64cd018 -r84b4229101bdb9c0dd01734754cf64308c35e2b7
#
#
#
# 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 = ""