summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2004-01-08 21:12:22 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2004-01-08 21:12:22 +0000
commit7d99691fa0b2639d4d35814227e670163ad7e0ba (patch)
treeedce5df2a0eaba0b6e7189eb945ab32504c47925 /dev-libs
parentstable on alpha and ia64 (diff)
downloadgentoo-2-7d99691fa0b2639d4d35814227e670163ad7e0ba.tar.gz
gentoo-2-7d99691fa0b2639d4d35814227e670163ad7e0ba.tar.bz2
gentoo-2-7d99691fa0b2639d4d35814227e670163ad7e0ba.zip
fix bug #37600
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/openssl/ChangeLog5
-rw-r--r--dev-libs/openssl/openssl-0.9.7c-r1.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 920ba4740322..f97f048e3cf3 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.63 2004/01/03 22:17:18 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.64 2004/01/08 21:12:22 robbat2 Exp $
+
+ 08 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> openssl-0.9.7c-r1.ebuild:
+ fix bug #37600
03 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7c-r1.ebuild:
Better filtering of existing cflags to be replaced by our own. Closing #35283.
diff --git a/dev-libs/openssl/openssl-0.9.7c-r1.ebuild b/dev-libs/openssl/openssl-0.9.7c-r1.ebuild
index f0a2ccf16f91..ba27484f8dd7 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.
# 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.10 2004/01/03 22:17:18 aliz Exp $
+# $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 $
inherit eutils flag-o-matic gcc
@@ -48,7 +48,7 @@ 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
+ sed -i -r -e "s|-O[23]|$CFLAGS|" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[-a-z0-9]+//" -e "s/-m486//" Configure
# openssl-0.9.6
test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
@@ -75,7 +75,7 @@ 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
+ sed -i -e "s|-O[23]|$CFLAGS|" -e "s/-fomit-frame-pointer//" -e -r "s/\-mcpu=[-a-z0-9]+//" -e "s/-m486//" Configure
}
}