Update the way CFLAGS are changed

3 files changed, 37 insertions, 13 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index f97f048e3cf3..75011d39b551 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.64 2004/01/08 21:12:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.65 2004/01/09 12:31:29 aliz Exp $
+
+  09 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7c-r1.ebuild:
+  Update the way CFLAGS are changed.
 
   08 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> openssl-0.9.7c-r1.ebuild:
   fix bug #37600
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 1c9ff2c29c3c..0492fddeaa36 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,12 +1,12 @@
-MD5 3b65374edf9e1c7d81d70b2e92369fcf openssl-0.9.7b-r3.ebuild 4828
-MD5 63f5ac435b89e23a22fe88c13759783c openssl-0.9.6l.ebuild 3126
-MD5 76a5eed10e658f5a1f0160cdc4ff40ca openssl-0.9.7c.ebuild 4911
-MD5 f03d8ba5c10fadf7f95f8666a90f85ac openssl-0.9.6k-r1.ebuild 3140
-MD5 5c3d1067153a2bc3d65f971253525931 openssl-0.9.6k.ebuild 2674
-MD5 c4f149986742954f83494af554c95748 openssl-0.9.7c-r1.ebuild 5915
-MD5 9cf09021f57481bd84b4f856ca8edcaf ChangeLog 11047
+MD5 0c60cc74801f0e02af30f0f83863b126 openssl-0.9.7b-r3.ebuild 4829
+MD5 cad6026de56f3aaae74790092bcf4a5e openssl-0.9.6l.ebuild 3127
+MD5 9e86692a9ae2fb049f12ed1136293925 openssl-0.9.7c.ebuild 4912
+MD5 80d13b0f2af478afe5734984c282ca1a openssl-0.9.6k-r1.ebuild 3141
+MD5 45b370cc497c7366b67fc60dd26508c3 openssl-0.9.6k.ebuild 2675
+MD5 ed242c5204410554fa7bc549091398df openssl-0.9.7c-r1.ebuild 6498
+MD5 a43501d0ff72e27a6d2aeba60e4efb1f ChangeLog 11157
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 be7c26f6a5d6abafaa041086b0536260 openssl-0.9.7b.ebuild 3357
+MD5 aecada0dff75d29960c20c1a5978fe78 openssl-0.9.7b.ebuild 3358
 MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
 MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6j-gentoo.diff 1591
 MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
diff --git a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild b/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
index ba27484f8dd7..3b484bed9d0a 100644
--- a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c-r1.ebuild,v 1.11 2004/01/08 21:12:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c-r1.ebuild,v 1.12 2004/01/09 12:31:29 aliz Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -48,7 +48,18 @@ src_unpack() {
 	if [ "$(gcc-version)" == "3.3" ] || [ "$(gcc-version)" == "3.2" ] ; then
 		filter-flags -fprefetch-loop-arrays
 	fi
-	sed -i -r -e "s|-O[23]|$CFLAGS|" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[-a-z0-9]+//" -e "s/-m486//" Configure
+
+	# replace CFLAGS
+	OLDIFS=$IFS
+	IFS="
+"
+	for a in $( grep -n -e "^\"linux-" Configure ); do
+		LINE=$( echo $a | awk -F: '{print $1}' )
+		CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' )
+		NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[-a-z0-9]+//" -e "s/-m486//" ) $CFLAGS"
+		sed -i "${LINE}s/$CUR_CFLAGS/$NEW_CFLAGS/" Configure
+	done
+	IFS=$OLDIFS
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
@@ -75,7 +86,17 @@ src_unpack() {
 			sed -i -e 's/parisc-\*-linux2/parisc\*-\*-linux2/' config
 		esac
 
-		sed -i -e "s|-O[23]|$CFLAGS|" -e "s/-fomit-frame-pointer//" -e -r "s/\-mcpu=[-a-z0-9]+//" -e "s/-m486//" Configure
+		# replace CFLAGS
+		OLDIFS=$IFS
+		IFS="
+"
+		for a in $( grep -n -e "^\"linux-" Configure ); do
+	  		LINE=$( echo $a | awk -F: '{print $1}' )
+	  		CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' )
+	  		NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[-a-z0-9]+//" -e "s/-m486//" ) $CFLAGS"
+	  		sed -i "${LINE}s/$CUR_CFLAGS/$NEW_CFLAGS/" Configure
+		done
+		IFS=$OLDIFS
 	}
 }