Add some fixes for the build on PPC, see bug #135249

Package-Manager: portage-2.1_rc4-r4

5 files changed, 169 insertions, 16 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c134f5f8a8d6..2f1f73d4b02b 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.223 2006/06/06 13:28:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.224 2006/06/09 06:39:13 suka Exp $
+
+  09 Jun 2006; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.2/omit-fp-workaround.diff, files/2.0.2/gentoo-2.0.2.diff,
+  openoffice-2.0.2-r2.ebuild:
+  Add some fixes for the build on PPC, see bug #135249, thanks to Hanno and
+  Santiago for working this out.
 
   06 Jun 2006; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.2-r1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 738b907aba3e..af07ac024808 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,10 +2,14 @@ AUX 2.0.1/alwayscrystal.diff 3222 RMD160 6f563dccad523db881def1fdb711df3949c2a68
 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
 SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
-AUX 2.0.2/gentoo-2.0.2.diff 1845 RMD160 53ef716a3fadb7555467a8448de7da4cba7c2425 SHA1 669a4abc20a0d1734bd8a071ea6143c7da4d7d10 SHA256 eb3cd6b39e18c4b870d8c33245bf51a0bb621b6a915b773a150cb04d8866f5b6
-MD5 7fffe54659a4a0aa4af8722c54039fd4 files/2.0.2/gentoo-2.0.2.diff 1845
-RMD160 53ef716a3fadb7555467a8448de7da4cba7c2425 files/2.0.2/gentoo-2.0.2.diff 1845
-SHA256 eb3cd6b39e18c4b870d8c33245bf51a0bb621b6a915b773a150cb04d8866f5b6 files/2.0.2/gentoo-2.0.2.diff 1845
+AUX 2.0.2/gentoo-2.0.2.diff 2382 RMD160 f334d89e4313a4b472fa5f01fce1f0670535fbbb SHA1 41aaeb0b42ec0e6ffddef7ba17ac574e522aee60 SHA256 59ec2de1ed9313f5107745f147f8e706c810a3a6c076ce3cf2e139f2cc50882e
+MD5 23b14b832bb2b7b14cf6a0322e47b8c2 files/2.0.2/gentoo-2.0.2.diff 2382
+RMD160 f334d89e4313a4b472fa5f01fce1f0670535fbbb files/2.0.2/gentoo-2.0.2.diff 2382
+SHA256 59ec2de1ed9313f5107745f147f8e706c810a3a6c076ce3cf2e139f2cc50882e files/2.0.2/gentoo-2.0.2.diff 2382
+AUX 2.0.2/omit-fp-workaround.diff 5179 RMD160 ea9136911827c90d1322dec5e2a77587168c2231 SHA1 e586d8b93fc8d91faff18654a70a4da8f4fd4e10 SHA256 62eeb363874a17fe40d2cc1188ea7249807ded1b7456e1d00e455accdc3eeb46
+MD5 0869a9ff1bb38a93e52da2308ef654c0 files/2.0.2/omit-fp-workaround.diff 5179
+RMD160 ea9136911827c90d1322dec5e2a77587168c2231 files/2.0.2/omit-fp-workaround.diff 5179
+SHA256 62eeb363874a17fe40d2cc1188ea7249807ded1b7456e1d00e455accdc3eeb46 files/2.0.2/omit-fp-workaround.diff 5179
 DIST OOO_2_0_1-binfilter.tar.bz2 18062219 RMD160 2ff50011435543209c3d7956e43c239ac4551450 SHA1 ea1a16372428db0337d3f0b6a42c3778cd4f4193 SHA256 eb9418d43c23e85d4507de43a2b94287203f440a147b12ab9554a7ebd5722df8
 DIST OOO_2_0_1-core.tar.bz2 109793621 RMD160 39af65ae67c6db30b39327da5821064af390a205 SHA1 950ec211715f990abd09487b71507aaa3b87d7e6 SHA256 a24c5021504fa930df563ed003776499579b925515a0b4a31c52fee895910ef3
 DIST OOO_2_0_1-lang.tar.bz2 55193297 RMD160 fad1e8181d9156decd9f34c10e1752c50ce5a41a SHA1 64ce31b89f2745d5206e175d06e3d3a209a696d1 SHA256 75775d4dd704298e25c6235e9d110495a10982d4d96bd9cac9498b19d014d705
@@ -32,14 +36,14 @@ EBUILD openoffice-2.0.2-r1.ebuild 7847 RMD160 1610581c5912b15779aa83360dc206e26c
 MD5 5793e92bb494bd09bd4b4b8904b77764 openoffice-2.0.2-r1.ebuild 7847
 RMD160 1610581c5912b15779aa83360dc206e26c1daef1 openoffice-2.0.2-r1.ebuild 7847
 SHA256 36b26349c48a7798ab1f3b25b81edbd82cf85c1520bce0d36c6921617c709b02 openoffice-2.0.2-r1.ebuild 7847
-EBUILD openoffice-2.0.2-r2.ebuild 8020 RMD160 a131db46fee9918836db65116a834f68dac5ed06 SHA1 a4f7f2ff3d11a3066fa9f2b6fc6de7f15faca5b2 SHA256 42a670e3d04f65f489c51fcc6c17cbd874c5dafc29907ed8dec247bdcc23da9f
-MD5 d9e5de72c70e62f03369a50de4fad6fe openoffice-2.0.2-r2.ebuild 8020
-RMD160 a131db46fee9918836db65116a834f68dac5ed06 openoffice-2.0.2-r2.ebuild 8020
-SHA256 42a670e3d04f65f489c51fcc6c17cbd874c5dafc29907ed8dec247bdcc23da9f openoffice-2.0.2-r2.ebuild 8020
-MISC ChangeLog 47199 RMD160 6fb900030b9ed69a2889885f7c1d63c03d4c1c58 SHA1 6fc3654bf7d16dd5a5f60a5bb94934e9277b7dc1 SHA256 a548bb29458e7dbe64598abfa23daba476122d95e1749cc069331ae420ef426b
-MD5 bc6fe7a7505cef05513069e9fa4b5129 ChangeLog 47199
-RMD160 6fb900030b9ed69a2889885f7c1d63c03d4c1c58 ChangeLog 47199
-SHA256 a548bb29458e7dbe64598abfa23daba476122d95e1749cc069331ae420ef426b ChangeLog 47199
+EBUILD openoffice-2.0.2-r2.ebuild 8103 RMD160 f74a6ddf14da231fb438da64f0d9648ddd38788a SHA1 875adf15eab42f78670c57c66ba1e350619cfdcf SHA256 766f3d7060f4c3157149fb3f154ce87359a34033deccc3558c94dd11bcdcdfc1
+MD5 55e7a52f847a3101d327bf9977eb99f0 openoffice-2.0.2-r2.ebuild 8103
+RMD160 f74a6ddf14da231fb438da64f0d9648ddd38788a openoffice-2.0.2-r2.ebuild 8103
+SHA256 766f3d7060f4c3157149fb3f154ce87359a34033deccc3558c94dd11bcdcdfc1 openoffice-2.0.2-r2.ebuild 8103
+MISC ChangeLog 47463 RMD160 822947bf7833808032ba1acfa4a87848bbb8b5a3 SHA1 a59bc2485e29a15f900fbe13ad7aeb55befb6887 SHA256 9db0ba10696d0a4369d1912afeda1d385a42e109d18b71ae01df3959b65dfc49
+MD5 27f417163f6512f3464689f42c995abd ChangeLog 47463
+RMD160 822947bf7833808032ba1acfa4a87848bbb8b5a3 ChangeLog 47463
+SHA256 9db0ba10696d0a4369d1912afeda1d385a42e109d18b71ae01df3959b65dfc49 ChangeLog 47463
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
index 252c18584c5c..a677c9fa1b16 100644
--- a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
+++ b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
@@ -60,3 +60,23 @@
  +CFLAGS+=-DHAS_ATKRECTANGLE
  +.ENDIF
  +
+--- patches/src680/apply
++++ patches/src680/apply
+@@ -1005,8 +1005,6 @@
+ gcj-encoding-utf8.diff
+ # enable/disable hunspell
+ gentoo-hunspell.diff
+-# build with -fomit-frame-pointer
+-omit-fp-workaround.diff
+ # more system db >= 4.3
+ system-db-4.3-use-lpthread.diff
+ # iz#58474 - build this part with db 4.2/4.3/4.4
+@@ -1033,6 +1031,8 @@
+ gentoo-xmlsecurity-system-nss.diff
+ # hack: drop gcc libs
+ store-drop-gcc-libs-on-linking.diff
++# build with -fomit-frame-pointer
++omit-fp-workaround.diff
+ 
+ #
+ # NOTE: 64 bit OOo is work in progress!
diff --git a/app-office/openoffice/files/2.0.2/omit-fp-workaround.diff b/app-office/openoffice/files/2.0.2/omit-fp-workaround.diff
new file mode 100644
index 000000000000..9cbafcaa0775
--- /dev/null
+++ b/app-office/openoffice/files/2.0.2/omit-fp-workaround.diff
@@ -0,0 +1,121 @@
+diff -Nur bridges.orig/source/cpp_uno/gcc3_freebsd_intel/makefile.mk bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	2005-09-08 00:20:36.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -55,6 +55,7 @@
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_linux_intel/makefile.mk bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_linux_intel/makefile.mk	2005-09-08 00:21:49.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -55,6 +55,7 @@
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_linux_powerpc/makefile.mk bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_linux_powerpc/makefile.mk	2005-09-08 00:23:04.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -59,6 +59,7 @@
+ 	$(SLO)$/uno2cpp.obj
+ 
+ 
++CFLAGSEXCEPTIONS += -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_linux_s390/makefile.mk bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_linux_s390/makefile.mk	2005-09-08 00:24:22.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -55,6 +55,7 @@
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_linux_sparc/makefile.mk bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_linux_sparc/makefile.mk	2005-09-08 00:25:31.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -54,6 +54,7 @@
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ NOOPTFILES = \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_linux_x86-64/makefile.mk bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_linux_x86-64/makefile.mk	2006-03-08 09:50:54.000000000 +0100
++++ bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -59,6 +59,7 @@
+ 	$(SLO)$/uno2cpp.obj
+ 
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_macosx_intel/makefile.mk bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_macosx_intel/makefile.mk	2006-02-03 18:35:29.000000000 +0100
++++ bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -55,6 +55,7 @@
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk	2006-04-06 13:52:41.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -59,6 +59,7 @@
+ 	$(SLO)$/uno2cpp.obj
+ 
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_netbsd_intel/makefile.mk bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_netbsd_intel/makefile.mk	2005-09-08 00:29:20.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -55,6 +55,7 @@
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_solaris_intel/makefile.mk bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_solaris_intel/makefile.mk	2005-09-08 00:30:32.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_solaris_intel/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -55,6 +55,7 @@
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ SLOFILES= \
+diff -Nur bridges.orig/source/cpp_uno/gcc3_solaris_sparc/makefile.mk bridges/source/cpp_uno/gcc3_solaris_sparc/makefile.mk
+--- bridges.orig/source/cpp_uno/gcc3_solaris_sparc/makefile.mk	2005-09-08 00:31:42.000000000 +0200
++++ bridges/source/cpp_uno/gcc3_solaris_sparc/makefile.mk	2006-04-27 16:15:35.000000000 +0200
+@@ -54,6 +54,7 @@
+ CFLAGS += -DLEAK_STATIC_DATA
+ .ENDIF
+ 
++CFLAGSEXCEPTIONS += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
+ CFLAGSNOOPT=-O0
+ 
+ NOOPTFILES = \
diff --git a/app-office/openoffice/openoffice-2.0.2-r2.ebuild b/app-office/openoffice/openoffice-2.0.2-r2.ebuild
index 2322c3d3239d..1b0b378ec451 100644
--- a/app-office/openoffice/openoffice-2.0.2-r2.ebuild
+++ b/app-office/openoffice/openoffice-2.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2-r2.ebuild,v 1.11 2006/06/06 13:28:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.2-r2.ebuild,v 1.12 2006/06/09 06:39:13 suka Exp $
 
 inherit check-reqs eutils fdo-mime flag-o-matic java-pkg kde-functions mono toolchain-funcs
 
@@ -154,6 +154,7 @@ src_unpack() {
 
 	#Some fixes for our patchset
 	cd ${S}
+	cp -vf ${FILESDIR}/${PV}/omit-fp-workaround.diff ${S}/patches/src680
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 
 	#Use flag checks
@@ -189,7 +190,6 @@ src_compile() {
 
 	# Compile problems with these ...
 	filter-flags "-funroll-loops"
-	filter-flags "-fomit-frame-pointer"
 	filter-flags "-fprefetch-loop-arrays"
 	filter-flags "-fno-default-inline"
 	filter-flags "-fstack-protector"
@@ -199,8 +199,10 @@ src_compile() {
 	replace-flags "-Os" "-O2"
 	replace-flags "-O1" "-O2"
 
+	use ppc && append-flags "-D_STLP_STRICT_ANSI"
+
 	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CFLAGS}"
+	export ARCH_FLAGS="${CXXFLAGS}"
 
 	# Make sure gnome-users get gtk-support
 	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"