diff options
| author |   Daniel Ahlberg <aliz@gentoo.org> | 2004-01-09 12:31:38 +0000 |
|---|---|---|
| committer | Daniel Ahlberg <aliz@gentoo.org> | 2004-01-09 12:31:38 +0000 |
| commit | 7a948503b89deb042efd8ccd5fee4230caae9e99 (patch) | |
| tree | 7c8630a006cc1fb4c7c2f301909b67a737af9c3e /dev-libs/openssl/openssl-0.9.7c-r1.ebuild | |
| parent | Version bump; closes bug #37575. (diff) | |
| download | gentoo-2-7a948503b89deb042efd8ccd5fee4230caae9e99.tar.gz gentoo-2-7a948503b89deb042efd8ccd5fee4230caae9e99.tar.bz2 gentoo-2-7a948503b89deb042efd8ccd5fee4230caae9e99.zip | |
Update the way CFLAGS are changed
Diffstat (limited to 'dev-libs/openssl/openssl-0.9.7c-r1.ebuild')
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.7c-r1.ebuild | 29 |
1 files changed, 25 insertions, 4 deletions
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 } } |