fix bug 45463, + and ppc64 support

4 files changed, 40 insertions, 14 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index b6c0de88ffaf..e117277ee6ce 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
 # 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.76 2004/03/30 14:25:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.77 2004/04/21 03:51:06 tgall Exp $
+
+  20 Apr 2004; Tom Gall <tgall@gentoo.org> openssl-0.9.7d.ebuild:
+  fix for ppc64 support see #45463
 
   30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> openssl-0.9.7d.ebuild:
   + use gcc eclass instead of gcc-dumpversion.
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 7a2a703e0e44..397655b0cbfa 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,14 +1,15 @@
-MD5 903cfb709af2fed361576aaf4ec186c6 openssl-0.9.7d.ebuild 7000
-MD5 4b52bb928caf7f4d8d7a31248986f556 openssl-0.9.7c.ebuild 4951
-MD5 0d5072939f27a2860b204f207e799d63 openssl-0.9.7c-r1.ebuild 7039
-MD5 4bab06fd5a12fb35d4e70dbb0288e3ad ChangeLog 13095
+MD5 a177736de4afa3a2566421bebc6700b5 ChangeLog 13198
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 e79309541ae54729fb8a04648a06d5d9 openssl-0.9.6m.ebuild 3114
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
+MD5 b65e8bccb932a7bd7187d3d04ef72772 openssl-0.9.6m.ebuild 3094
+MD5 7bf6376eaa84b73286f045aae404cd50 openssl-0.9.7c-r1.ebuild 7050
+MD5 7c037c04f4f051f5e125867b9671bf03 openssl-0.9.7c.ebuild 4967
+MD5 08a1d28ff7f1abac2a0b8d1fc4606eea openssl-0.9.7d.ebuild 7056
 MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67
 MD5 8ad6215b1b4c9d53c435ceff6b537e35 files/digest-openssl-0.9.7c 134
-MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d 134
 MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134
-MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
+MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d 134
 MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487
+MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
+MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
+MD5 87c41c3621bb08d1e7798e052e1bf8b6 files/addppc64support.diff 1788
diff --git a/dev-libs/openssl/files/addppc64support.diff b/dev-libs/openssl/files/addppc64support.diff
new file mode 100644
index 000000000000..de31cbb636d0
--- /dev/null
+++ b/dev-libs/openssl/files/addppc64support.diff
@@ -0,0 +1,21 @@
+--- openssl-0.9.7d.orig/config	2004-01-21 03:58:17.000000000 -0600
++++ openssl-0.9.7d/config	2004-04-21 03:24:38.288000448 -0500
+@@ -540,7 +540,7 @@
+   ppc64-*-linux2)
+ 	#Use the standard target for PPC architecture until we create a
+ 	#special one for the 64bit architecture.
+-	OUT="linux-ppc" ;;
++	OUT="linux-ppc64" ;;
+   ppc-*-linux2) OUT="linux-ppc" ;;
+   m68k-*-linux*) OUT="linux-m68k" ;;
+   ia64-*-linux?) OUT="linux-ia64" ;;
+--- openssl-0.9.7d.orig/Configure	2004-04-21 03:16:13.868020288 -0500
++++ openssl-0.9.7d/Configure	2004-04-21 03:24:38.288000448 -0500
+@@ -387,6 +387,7 @@
+ "linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO   -Wall -O2::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-mips",   "gcc:-DB_ENDIAN -DTERMIO   -Wall -O2::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO   -Wall -O2::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ppc64", "gcc:-DB_ENDIAN -DNO_ASM -DTERMIO  -Wall  ::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG ::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO   -Wall -O2::-D_REENTRANT:::BN_LLONG::",
+ "linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM   -Wall -O2::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-s390x",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM   -Wall -O2::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/dev-libs/openssl/openssl-0.9.7d.ebuild b/dev-libs/openssl/openssl-0.9.7d.ebuild
index 1eaa22a05eef..78b5b336fb57 100644
--- a/dev-libs/openssl/openssl-0.9.7d.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7d.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2004/04/19 19:10:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d.ebuild,v 1.6 2004/04/21 03:51:06 tgall Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -65,6 +65,9 @@ set +x
 		sed -i "${LINE}s/$CUR_CFLAGS/$NEW_CFLAGS/" Configure
 	done
 	IFS=$OLDIFS
+	if [ "${ARCH}" = "ppc64" ]; then
+		epatch ${FILESDIR}/addppc64support.diff
+	fi
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
@@ -134,9 +137,7 @@ src_compile() {
 
 	einfo "Compiling ${P}"
 	emake all || die
-	if [ "`use !ppc64`" ]; then
-		make test || die
-	fi
+	make test || die
 
 	# openssl-0.9.6
 	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {