summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2003-05-20 19:16:31 +0000
committerTavis Ormandy <taviso@gentoo.org>2003-05-20 19:16:31 +0000
commit11e484ec0589def9b961e859f6a550b44fe30980 (patch)
treede0d2b9da01b34b6f7eddb5f2ba10426007dc973 /dev-libs
parentcleanup (diff)
downloadgentoo-2-11e484ec0589def9b961e859f6a550b44fe30980.tar.gz
gentoo-2-11e484ec0589def9b961e859f6a550b44fe30980.tar.bz2
gentoo-2-11e484ec0589def9b961e859f6a550b44fe30980.zip
More ccc/openssl co-existance fixes on Alpha.
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/openssl/ChangeLog6
-rw-r--r--dev-libs/openssl/Manifest6
-rw-r--r--dev-libs/openssl/openssl-0.9.6i-r2.ebuild13
-rw-r--r--dev-libs/openssl/openssl-0.9.7b.ebuild11
4 files changed, 25 insertions, 11 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 8e29aa6b8175..7a89f02eb3e3 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
# 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.36 2003/05/19 00:43:19 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.37 2003/05/20 19:16:23 taviso Exp $
+
+ 20 May 2003; Tavis Ormandy <taviso@gentoo.org> openssl-0.9.6i-r2.ebuild,
+ openssl-0.9.7b.ebuild:
+ ccc/openssl co-existance fixes.
18 May 2003; Tavis Ormandy <taviso@gentoo.org> openssl-0.9.6i-r2.ebuild:
making ccc usable.
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 2a7fc822b7b2..f0c868f967c1 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -2,10 +2,10 @@ MD5 ae8b3398ac108e38cedd3c0b835026c2 openssl-0.9.6i-r1.ebuild 2423
MD5 f9889068ffc2fc73a7a85ac5579e0f18 openssl-0.9.7a-r1.ebuild 2569
MD5 7e42226d154e07d3ae1223cbc0a60f85 openssl-0.9.7a.ebuild 2517
MD5 f1f7f7f88d2931001e73d0d9f33d499f openssl-0.9.6i.ebuild 2384
-MD5 fd74203e3145ec3d5ab9752481675910 openssl-0.9.6i-r2.ebuild 2977
-MD5 6ba2f0d8c6390a41ce15108064dfb3ca ChangeLog 6300
+MD5 894cbd2e4688992fbb86afada3f24ab0 openssl-0.9.6i-r2.ebuild 2873
+MD5 912b928bef473f280aedf202e6db2719 ChangeLog 6435
MD5 f48f6270ee3c27f892a7fdb0cb9ee759 openssl-0.9.7a-r2.ebuild 2626
-MD5 87b5a5e9a9944da30146bc43a6d811b5 openssl-0.9.7b.ebuild 2536
+MD5 be1bf2ca3de7971873e0aef8cddbd9cb openssl-0.9.7b.ebuild 2858
MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
MD5 91c90424223d7c64fe20f960bcc48b25 files/openssl-0.9.6g-gentoo.diff 1592
MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.7a-blinding.patch 1717
diff --git a/dev-libs/openssl/openssl-0.9.6i-r2.ebuild b/dev-libs/openssl/openssl-0.9.6i-r2.ebuild
index a38226e3e8ef..d59aeddce0f8 100644
--- a/dev-libs/openssl/openssl-0.9.6i-r2.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6i-r2.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.6i-r2.ebuild,v 1.3 2003/05/19 00:43:19 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6i-r2.ebuild,v 1.4 2003/05/20 19:16:23 taviso Exp $
inherit eutils
@@ -43,15 +43,16 @@ src_unpack() {
's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
Configure > Configure.orig
elif [ "${ARCH}" = "alpha" ]; then
- #sed -e \
- #'s!^"linux-alpha-ccc"\(.*\)\${alpha_asm}!"linux-alpha-ccc"\1\${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!
- #s!^"linux-alpha+bwx-ccc"\(.*\)\${alpha_asm}!"linux-alpha+bwx-ccc"\1\${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
- # Configure > Configure.orig
- if [ ! "${CC}" = "ccc" ]; then
+ if [ "${CC}" != "ccc" ]; then
+ # ccc compiled openssl will break things linked against
+ # a gcc compiled openssl, the configure will automatically detect
+ # ccc and use it, so stop that if user hasnt asked for it.
+ #
sed -e \
's!CC=ccc!CC=gcc!' config > config.orig
cp config.orig config
fi
+ cp Configure Configure.orig
else
cp Configure Configure.orig
fi
diff --git a/dev-libs/openssl/openssl-0.9.7b.ebuild b/dev-libs/openssl/openssl-0.9.7b.ebuild
index 5c1875305bbf..62e1577985bd 100644
--- a/dev-libs/openssl/openssl-0.9.7b.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7b.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.7b.ebuild,v 1.3 2003/05/19 00:43:19 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7b.ebuild,v 1.4 2003/05/20 19:16:23 taviso Exp $
inherit eutils
@@ -42,6 +42,15 @@ src_unpack() {
else
cp Configure Configure.orig
fi
+ if [ "${ARCH}" = "alpha" -a "${CC}" != "ccc" ]; then
+ # ccc compiled openssl will break things linked against
+ # a gcc compiled openssl, the configure will automatically detect
+ # ccc and use it, so stop that if user hasnt asked for it.
+ sed -e \
+ 's!CC=ccc!CC=gcc!' config > config.orig
+ cp config.orig config
+ fi
+
sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
}