summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Thibaut <murphy@gentoo.org>2003-02-28 12:43:54 +0000
committerMaarten Thibaut <murphy@gentoo.org>2003-02-28 12:43:54 +0000
commit159a05ec43097264e7e99ff2b71db63ee495a1d7 (patch)
treeea25608726ae9efb343c00b257051990183ed5e2 /dev-libs/openssl
parentoops (diff)
downloadgentoo-2-159a05ec43097264e7e99ff2b71db63ee495a1d7.tar.gz
gentoo-2-159a05ec43097264e7e99ff2b71db63ee495a1d7.tar.bz2
gentoo-2-159a05ec43097264e7e99ff2b71db63ee495a1d7.zip
Fix for building sparc32 on sparc64
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog6
-rw-r--r--dev-libs/openssl/openssl-0.9.6i.ebuild14
2 files changed, 17 insertions, 3 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 99538710f49b..8cc326b9b95f 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.29 2003/02/25 18:34:56 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.30 2003/02/28 12:43:54 murphy Exp $
+
+ 28 Feb 2003; Maarten Thibaut <murphy@gentoo.org> openssl-0.9.6i.ebuild :
+ Add code to detect sparc32 build on sparc64. Add code to compile for
+ sparc32 on sparc64 depending on PROFILE_ARCH environment variable.
23 Feb 2003; Zach Welch <zwelch@gentoo.org> openssl-0.9.6i.ebuild :
Add arm patch to ebuild to fix problems linking aginst libcrypto.so
diff --git a/dev-libs/openssl/openssl-0.9.6i.ebuild b/dev-libs/openssl/openssl-0.9.6i.ebuild
index f803b00aaf9f..c0f38fa6b644 100644
--- a/dev-libs/openssl/openssl-0.9.6i.ebuild
+++ b/dev-libs/openssl/openssl-0.9.6i.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.ebuild,v 1.4 2003/02/25 18:34:56 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6i.ebuild,v 1.5 2003/02/28 12:43:54 murphy Exp $
IUSE=""
@@ -15,6 +15,10 @@ LICENSE="as-is"
SLOT="0"
KEYWORDS="x86 ppc alpha sparc mips hppa arm"
+if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
+ SSH_TARGET="linux-sparcv8"
+fi
+
src_unpack() {
unpack ${A} ; cd ${S}
@@ -43,7 +47,13 @@ src_unpack() {
}
src_compile() {
- ./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
+ if [ ${SSH_TARGET} ]; then
+ einfo "Forcing ${SSH_TARGET} compile"
+ ./Configure ${SSH_TARGET} --prefix=/usr \
+ --openssldir=/etc/ssl shared threads || die
+ else
+ ./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
+ fi
# i think parallel make has problems
make all || die
}