address ppc64 bug #50637

4 files changed, 37 insertions, 24 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index f40647aa9673..45cdcf41b546 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.79 2004/04/28 12:05:56 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.80 2004/05/10 15:18:41 tgall Exp $
+
+  10 May 2004; Tom Gall <tgall@gentoo.org> openssl-0.9.7d.ebuild:
+  fix for ppc64, bug #50637
 
   28 Apr 2004; Tom Gall <tgall@gentoo.org> openssl-0.9.7d.ebuild:
   patch fix ppc64, bug #49102
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index fb7112b01fde..e7d7aa12bb4d 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,15 +1,15 @@
-MD5 3273982fe14e9b97e4fb1d0fb73d048b openssl-0.9.7d.ebuild 7347
-MD5 7c037c04f4f051f5e125867b9671bf03 openssl-0.9.7c.ebuild 4967
-MD5 7bf6376eaa84b73286f045aae404cd50 openssl-0.9.7c-r1.ebuild 7050
-MD5 1bef4e8c34eeeacc78a0eb8069e7fa00 ChangeLog 13403
+MD5 3deb111af0b89f1589a6f277064c2b5f ChangeLog 13498
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 b65e8bccb932a7bd7187d3d04ef72772 openssl-0.9.6m.ebuild 3094
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936
-MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936
+MD5 7bf6376eaa84b73286f045aae404cd50 openssl-0.9.7c-r1.ebuild 7050
+MD5 7c037c04f4f051f5e125867b9671bf03 openssl-0.9.7c.ebuild 4967
+MD5 d1f3714ee6ae3aece39c96dbf29de656 openssl-0.9.7d.ebuild 7605
 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 96214efd651aaea934edd6699f66c2b6 files/addppc64support.diff 1788
+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 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
diff --git a/dev-libs/openssl/files/addppc64support.diff b/dev-libs/openssl/files/addppc64support.diff
index 261f21d36d70..6e60ecae5a70 100644
--- a/dev-libs/openssl/files/addppc64support.diff
+++ b/dev-libs/openssl/files/addppc64support.diff
@@ -9,13 +9,13 @@
    ppc-*-linux2) OUT="linux-ppc" ;;
    m68k-*-linux*) OUT="linux-m68k" ;;
    ia64-*-linux?) OUT="linux-ia64" ;;
---- openssl-0.9.7d/Configure.orig	2004-04-25 15:38:35.723264568 +0000
-+++ openssl-0.9.7d/Configure	2004-04-25 15:39:29.448097152 +0000
-@@ -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)",
+--- openssl-0.9.7d/Configure.orig	2004-03-12 21:24:44.000000000 +0000
++++ openssl-0.9.7d/Configure	2004-05-07 16:11:06.000000000 +0000
+@@ -404,6 +404,7 @@
+ "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+ "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
 +"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)",
+ 
+ # NCR MP-RAS UNIX ver 02.03.01
+ "ncr-scde","cc:-O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw::(unknown)::-lsocket -lnsl -lc89:${x86_gcc_des} ${x86_gcc_opts}:::",
diff --git a/dev-libs/openssl/openssl-0.9.7d.ebuild b/dev-libs/openssl/openssl-0.9.7d.ebuild
index 5516eeaae364..91caee10f19e 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.9 2004/04/28 06:50:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7d.ebuild,v 1.10 2004/05/10 15:18:41 tgall Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -30,6 +30,10 @@ src_unpack() {
 	# openssl-0.9.7
 	cd ${WORKDIR}/${P}
 
+	if [ "${ARCH}" = "ppc64" ]; then
+		epatch ${FILESDIR}/addppc64support.diff
+	fi
+
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	if [ "${ARCH}" = "hppa" ]; then
@@ -46,6 +50,7 @@ src_unpack() {
 			's!^"linux-elf-arm"\(.*\)::BN\(.*\)!"linux-elf-arm"\1:-ldl:BN\2!' \
 			Configure
 	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 
@@ -67,13 +72,18 @@ src_unpack() {
 	for a in $( grep -n -e "^\"linux-" Configure ); do
 		LINE=$( echo $a | awk -F: '{print $1}' )
 		CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' )
-		NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[-a-z0-9]+//" -e "s/-m486//" ) $CFLAGS"
+		# for ppc64 I have to be careful given current
+		# toolchain issues
+		if [ "${ARCH}" != "ppc64" ]; then
+			NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[-a-z0-9]+//" -e "s/-m486//" ) $CFLAGS"
+		else
+			NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[-a-z0-9]+//" -e "s/-m486//" ) "
+
+		fi
+
 		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 && {