summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-03-30 14:25:29 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-03-30 14:25:29 +0000
commit2fb341ffbdcaf39e57d3fc556c216161063cd607 (patch)
tree1683ac71e5d3c748d208fb387a4907a2da5999da /dev-libs/openssl
parentstable on ppc (Manifest recommit) (diff)
downloadgentoo-2-2fb341ffbdcaf39e57d3fc556c216161063cd607.tar.gz
gentoo-2-2fb341ffbdcaf39e57d3fc556c216161063cd607.tar.bz2
gentoo-2-2fb341ffbdcaf39e57d3fc556c216161063cd607.zip
Closing #45002 and #45600.
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog7
-rw-r--r--dev-libs/openssl/openssl-0.9.7d.ebuild22
2 files changed, 18 insertions, 11 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 6af3c70f4f85..b6c0de88ffaf 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/openssl
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.75 2004/03/17 17:19:01 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.76 2004/03/30 14:25:29 aliz Exp $
+
+ 30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7d.ebuild:
+ + use gcc eclass instead of gcc-dumpversion.
+ + filter -funroll-loops, closing #45600.
+ + use emake of 0.9.7, closing #45002.
*openssl-0.9.6m (17 Mar 2004)
*openssl-0.9.7d (17 Mar 2004)
diff --git a/dev-libs/openssl/openssl-0.9.7d.ebuild b/dev-libs/openssl/openssl-0.9.7d.ebuild
index 946448d6d490..853d497d3c06 100644
--- a/dev-libs/openssl/openssl-0.9.7d.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7d.ebuild
@@ -1,8 +1,8 @@
# 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.7d.ebuild,v 1.3 2004/03/17 23:27:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d.ebuild,v 1.4 2004/03/30 14:25:29 aliz Exp $
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic gcc
OLD_096_P="${PN}-0.9.6m"
@@ -15,7 +15,8 @@ HOMEPAGE="http://www.openssl.org/"
RDEPEND="virtual/glibc"
DEPEND="${RDEPEND}
>=dev-lang/perl-5
- >=sys-apps/sed-4"
+ >=sys-apps/sed-4
+ sys-devel/bc"
LICENSE="as-is"
SLOT="0"
@@ -44,12 +45,13 @@ src_unpack() {
sed -i -e \
's!CC=ccc!CC=gcc!' config
fi
-
- local gcc_version=$(gcc -dumpversion | cut -d. -f1,2)
- if [ "${gcc_version}" == "3.3" ] || [ "${gcc_version}" == "3.2" ] ; then
- filter-flags -fprefetch-loop-arrays -freduce-all-givs
- fi
-
+set -x
+ case $( gcc-version ) in
+ 3.3 | 3.2 )
+ filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops
+ ;;
+ esac
+set +x
# replace CFLAGS
OLDIFS=$IFS
IFS="
@@ -129,7 +131,7 @@ src_compile() {
fi
einfo "Compiling ${P}"
- make all || die
+ emake all || die
if [ "`use !ppc64`" ]; then
make test || die
fi