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

(Portage version: 2.1_rc4-r4)

4 files changed, 153 insertions, 4 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/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"