fix ppc64 support #92074

Package-Manager: portage-2.0.51.22-r1

3 files changed, 20 insertions, 12 deletions

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 5dc2d1b61fc1..4cb4d76f15a1 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -3,7 +3,7 @@ MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074
 MD5 e59c3cc3221269d3ae08609d821b6b21 openssl-0.9.7c-r1.ebuild 7019
 MD5 a217f5a3406e3fd1cf335c3c11760657 openssl-0.9.7e-r1.ebuild 8518
-MD5 2e9aaa6888d653ee8bffb2849a006fcd openssl-0.9.7g.ebuild 5205
+MD5 3ef25ed5c6d7dd2cdc7a89a15fb86814 openssl-0.9.7g.ebuild 5135
 MD5 5f32bf277f8520c8054e95c6a8d73f4b openssl-0.9.7d-r2.ebuild 8972
 MD5 8a6bfea1784fd62ac3a143586b24fd59 openssl-0.9.7e.ebuild 7844
 MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327
@@ -31,3 +31,4 @@ MD5 cde67bc688a59d0178f1a6e1bb1db7cf files/openssl-0.9.7g-ptr-casting.patch 714
 MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881
 MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440
 MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880
+MD5 be045f45d974ec215ec4986c6c7b6ffb files/openssl-0.9.7g-ppc64.patch 856
diff --git a/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch b/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch
new file mode 100644
index 000000000000..9ea804aed00b
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7g-ppc64.patch
@@ -0,0 +1,11 @@
+Remove silly compiler flags which aren't needed.
+
+http://bugs.gentoo.org/92074
+
+--- openssl-0.9.7g/Configure
++++ openssl-0.9.7g/Configure
+@@ -407,3 +407,3 @@
+ # -bpowerpc64-linux is transient option, -m64 should be the one to use...
+-"linux-ppc64",  "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-ppc64",  "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
diff --git a/dev-libs/openssl/openssl-0.9.7g.ebuild b/dev-libs/openssl/openssl-0.9.7g.ebuild
index d4d6841894f0..ac8cca420a97 100644
--- a/dev-libs/openssl/openssl-0.9.7g.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7g.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.8 2005/05/14 17:37:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.9 2005/05/22 09:12:49 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"
 LICENSE="openssl"
 SLOT="0"
 # ia64 is ABI incompat atm, do not change the KEYWORD
-KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~m68k -mips ~ppc -ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa -ia64 ~m68k -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="emacs test bindist"
 
 RDEPEND=""
@@ -25,6 +25,7 @@ src_unpack() {
 
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${PN}-0.9.7g-ppc64.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7-hppa-fix-detection.patch
 	epatch "${FILESDIR}"/${PN}-0.9.7-alpha-default-gcc.patch
@@ -56,16 +57,11 @@ 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}' )
-		# 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::" ) "
+		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::")
+		# ppc64's current toolchain sucks at optimization and will break this package
+		[[ $(tc-arch) != "ppc64" ]] && NEW_CFLAGS="${NEW_CFLAGS} ${CFLAGS}"
 
-		fi
-
-		sed -i "${LINE}s:$CUR_CFLAGS:$NEW_CFLAGS:" Configure \
-		|| die "sed failed"
+		sed -i "${LINE}s:$CUR_CFLAGS:$NEW_CFLAGS:" Configure || die "sed failed"
 	done
 	IFS=$OLDIFS