summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Woods <wwoods@gentoo.org>2003-07-29 19:52:27 +0000
committerWill Woods <wwoods@gentoo.org>2003-07-29 19:52:27 +0000
commit68d1bb8644888411c016c27ac20b2983c095903f (patch)
treec8a79645527f74a115809f182e6a162896ec7db8 /dev-libs
parentVersion bumped (diff)
downloadgentoo-2-68d1bb8644888411c016c27ac20b2983c095903f.tar.gz
gentoo-2-68d1bb8644888411c016c27ac20b2983c095903f.tar.bz2
gentoo-2-68d1bb8644888411c016c27ac20b2983c095903f.zip
use SSH_TARGET on alpha to make openssl honor CHOST
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/openssl/Manifest28
-rw-r--r--dev-libs/openssl/openssl-0.9.6j.ebuild19
2 files changed, 20 insertions, 27 deletions
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index bb6acb097e8d..eec0e4487e35 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,28 +1,28 @@
MD5 349697813ac462e04b2e139710e51a7a ChangeLog 7075
-MD5 ae8b3398ac108e38cedd3c0b835026c2 openssl-0.9.6i-r1.ebuild 2423
-MD5 464b8ed8737ae71a3a5b68bcf00b0942 openssl-0.9.6i-r2.ebuild 2946
MD5 f1f7f7f88d2931001e73d0d9f33d499f openssl-0.9.6i.ebuild 2384
-MD5 be42b744d92ed5e2ab2f7f44a26f3162 openssl-0.9.6j.ebuild 2857
+MD5 f1a5df6b5dce92721a5af106451d413e openssl-0.9.7a.ebuild 2492
+MD5 ae8b3398ac108e38cedd3c0b835026c2 openssl-0.9.6i-r1.ebuild 2423
MD5 50a90350cae652ce283a56cd78e0d671 openssl-0.9.7a-r1.ebuild 2546
MD5 ca4ccf93dbb4440d002992d253607030 openssl-0.9.7a-r2.ebuild 2603
-MD5 f1a5df6b5dce92721a5af106451d413e openssl-0.9.7a.ebuild 2492
MD5 f02c69b1a1f0c0636a4302ac9c080dee openssl-0.9.7b.ebuild 2872
+MD5 edabd2eda5dcd51b742a2fc78cdc5d6c openssl-0.9.6j.ebuild 2615
+MD5 464b8ed8737ae71a3a5b68bcf00b0942 openssl-0.9.6i-r2.ebuild 2946
+MD5 91c90424223d7c64fe20f960bcc48b25 files/openssl-0.9.6g-gentoo.diff 1592
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6g-r1-gentoo.diff 1591
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6h-gentoo.diff 1591
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7-gentoo.diff 936
MD5 8c719455d9438ab2eb36279f5befe581 files/digest-openssl-0.9.6i 67
+MD5 316d12ece21402d61deacf5bb8ecf4b3 files/digest-openssl-0.9.7a 67
+MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6i-gentoo.diff 1591
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7a-gentoo.diff 936
MD5 8c719455d9438ab2eb36279f5befe581 files/digest-openssl-0.9.6i-r1 67
MD5 8c719455d9438ab2eb36279f5befe581 files/digest-openssl-0.9.6i-r2 67
-MD5 6c1086cc2f14b7eee2c5a59f55a30811 files/digest-openssl-0.9.6j 67
-MD5 316d12ece21402d61deacf5bb8ecf4b3 files/digest-openssl-0.9.7a 67
MD5 316d12ece21402d61deacf5bb8ecf4b3 files/digest-openssl-0.9.7a-r1 67
MD5 316d12ece21402d61deacf5bb8ecf4b3 files/digest-openssl-0.9.7a-r2 67
-MD5 ec3ece282da08b6e27d213ee22c00208 files/digest-openssl-0.9.7b 67
-MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
-MD5 91c90424223d7c64fe20f960bcc48b25 files/openssl-0.9.6g-gentoo.diff 1592
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6g-r1-gentoo.diff 1591
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6h-gentoo.diff 1591
MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6i-gentoo.diff 1591
MD5 e47009f3748b8b56f2a2859405dc1b41 files/openssl-0.9.6i-klima_pokorny_rosa_attack.patch 2144
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7-gentoo.diff 936
MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.7a-blinding.patch 1717
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7a-gentoo.diff 936
MD5 e47009f3748b8b56f2a2859405dc1b41 files/openssl-0.9.7a-klima_pokorny_rosa_attack.patch 2144
+MD5 ec3ece282da08b6e27d213ee22c00208 files/digest-openssl-0.9.7b 67
+MD5 6c1086cc2f14b7eee2c5a59f55a30811 files/digest-openssl-0.9.6j 67
diff --git a/dev-libs/openssl/openssl-0.9.6j.ebuild b/dev-libs/openssl/openssl-0.9.6j.ebuild
index eaab0bea0d31..ccb4ad380e9e 100644
--- a/dev-libs/openssl/openssl-0.9.6j.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6j.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.6j.ebuild,v 1.5 2003/07/24 04:46:38 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6j.ebuild,v 1.6 2003/07/29 19:52:18 wwoods Exp $
inherit eutils
@@ -23,7 +23,11 @@ fi
if [ "`uname -m`" = "parisc64" ]; then
SSH_TARGET="linux-parisc"
fi
-
+
+case $CHOST in
+ alphaev56*|alphaev6*) SSH_TARGET="linux-alpha+bwx-${CC:-gcc}" ;;
+ alpha*) SSH_TARGET="linux-alpha-${CC:-gcc}" ;;
+esac
src_unpack() {
unpack ${A} ; cd ${S}
@@ -45,17 +49,6 @@ src_unpack() {
sed -e \
'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
- 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