Fix building with GCC 4.5+ wrt #326519.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 145 insertions, 17 deletions

diff --git a/sci-libs/openfoam-kernel/ChangeLog b/sci-libs/openfoam-kernel/ChangeLog
index da40c922078f..03bd6c7d4703 100644
--- a/sci-libs/openfoam-kernel/ChangeLog
+++ b/sci-libs/openfoam-kernel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/openfoam-kernel
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-kernel/ChangeLog,v 1.5 2010/04/25 11:32:35 jlec Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-kernel/ChangeLog,v 1.6 2010/07/01 21:24:24 ssuominen Exp $
+
+  01 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  openfoam-kernel-1.5_p20090311.ebuild,
+  +files/openfoam-kernel-1.5_p20090311-gcc45.patch:
+  Fix building with GCC 4.5+ wrt #326519.
 
   25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   openfoam-kernel-1.5_p20090311.ebuild, -files/OpenFOAM-1.5-compile.patch:
diff --git a/sci-libs/openfoam-kernel/Manifest b/sci-libs/openfoam-kernel/Manifest
index 605fb7aa08b9..fa66072de6f1 100644
--- a/sci-libs/openfoam-kernel/Manifest
+++ b/sci-libs/openfoam-kernel/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX OpenFOAM-1.5-ggi.patch 5907 RMD160 9a678e2fd7d36e862ffa1ed7e18aa4a073b77ea3 SHA1 2053a2e4e0c96500330b8ec233673391cb7487cf SHA256 e592d47ffee2fe9495378860932630936d5d838cf7290fb10d1e298986729b6c
 AUX openfoam-kernel-1.5_p20090311-gcc44.patch 1724 RMD160 4af87a7d199df2bf4585349cb3081cd61d8b648b SHA1 fc932548b0612666681ba0fdfa8ea0a842fe91f1 SHA256 153494cb285dac663b07fe71fccbeba7678cbcde5a0967e02bffcbcf247c8003
+AUX openfoam-kernel-1.5_p20090311-gcc45.patch 6327 RMD160 220779ada5fb67bdc374c7f818897118ef584305 SHA1 3206a6f177852c856a42a18e838d0deb67bbf4e1 SHA256 5bcac0c15478a79fb811dc80a5f41eb8d5db9f7bac7165dda82d30d12153ab0b
 DIST OpenFOAM-1.5-compile-2.patch.bz2 2939 RMD160 62e3e5b688a0a5e34f8406fdab0af6001df46f26 SHA1 d6b1ce5403ff173242b92521a2a5f446194c7b72 SHA256 9bcad542c35452271d80585e5dc174627791e33b5c2e089edfbceb0aa13c0bc1
 DIST OpenFOAM-1.5-svn.patch 4002548 RMD160 75b28c0c9c03b3e3886d0d90e8c631233d0734a2 SHA1 349e50a91095e0ff0e75b41f8eb8453623d5e4a8 SHA256 2a5872a4dbb8f58cb55b1ec64bcdc6f8e462ce2a541d21f1a8fc5faeb345d7d4
 DIST OpenFOAM-1.5.General.tgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31
 DIST OpenFOAM-git-1.5_p20090311.patch 711366 RMD160 ac9f6710aa9c92473068c18cf97ca2b25dc904e8 SHA1 068ade9111558adf4b2330e6acb5aabfe55f58fe SHA256 393ad127f9bd2cf6eb8826d65e2528d83ad8b6cceeab3de5ed04fb01746e3201
-EBUILD openfoam-kernel-1.5_p20090311.ebuild 1808 RMD160 8acee97a7a75823b171bcf9e2fc7fca0edf56c21 SHA1 91b4a7073a71c65633464da16ff69750f9a89f67 SHA256 22e8b1e0a5adda833f59a5732eaf7a13be4c6d10f6a689f02a6f9440fee8b4db
-MISC ChangeLog 4812 RMD160 a6595a46bd00304722c289cfdfd4cbf79b9af266 SHA1 4a9da8a9e6cf6d62874b929839570f0e1945ecc0 SHA256 f3c6db9e09a146b613246ef9cc50232f18374b4adc0c76dc8b20a3c3609d08fd
+EBUILD openfoam-kernel-1.5_p20090311.ebuild 1812 RMD160 c3a63a334e817824c04f9a2c78f2b35184a784fb SHA1 45e90b5d0796b56b029fe33651274c325bb1afcd SHA256 92ec275f8765195b5cc46c82a0128e643fc70dd588463e29781e28149f2fdf77
+MISC ChangeLog 5006 RMD160 f75c92c41328bfb2239305b50af55cbaffbc09d5 SHA1 dbb3ecda0ba425e8c9e714970cc1d07155b3029a SHA256 368336a999eb57f26d1146d7df730654e91dff97b2b2494f35dbee3661705c16
 MISC metadata.xml 342 RMD160 bba0c7eb3af0d1cd2322a40e86f4a80a0f48b6cf SHA1 7950d74b3d7d4fbe7167b487c5cd26559548b4ab SHA256 b57f05d81648f5a92cedd91c025852cb3bc5fc8d4ab4d110eb6886fc89e2ba97
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvUKFgACgkQgAnW8HDreRaEBwCfbuYWvbS7kHbcMXtNOayMeka3
-IuEAn36e0omFdvUwE298+vLLuEwKD8dW
-=ppeb
------END PGP SIGNATURE-----
diff --git a/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc45.patch b/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc45.patch
new file mode 100644
index 000000000000..3432f01bb8ed
--- /dev/null
+++ b/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc45.patch
@@ -0,0 +1,132 @@
+diff -ur OpenFOAM-1.5.orig/wmake/MakefileFiles OpenFOAM-1.5/wmake/MakefileFiles
+--- OpenFOAM-1.5.orig/wmake/MakefileFiles	2008-06-27 14:19:31.000000000 +0300
++++ OpenFOAM-1.5/wmake/MakefileFiles	2010-07-02 00:07:07.000000000 +0300
+@@ -58,7 +58,7 @@
+ allFiles : $(FILES) $(SFILES) $(OFILES) $(DFILES) $(IFILES)
+ 
+ $(FILES) : files
+-	@$(CPP) $(GFLAGS) $(FFLAGS) files > $(FILES)
++	@$(CPP) -P $(GFLAGS) $(FFLAGS) files > $(FILES)
+ 
+ $(SFILES): files
+ 	@wmakeDerivedFiles
+diff -ur OpenFOAM-1.5.orig/wmake/MakefileOptions OpenFOAM-1.5/wmake/MakefileOptions
+--- OpenFOAM-1.5.orig/wmake/MakefileOptions	2010-07-02 00:12:07.000000000 +0300
++++ OpenFOAM-1.5/wmake/MakefileOptions	2010-07-02 00:05:52.000000000 +0300
+@@ -48,7 +48,7 @@
+ #------------------------------------------------------------------------------
+ 
+ $(OPTIONS)  : options
+-	@wmkdir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options > $(OPTIONS)
++	@wmkdir $(WM_OPTIONS) ; $(CPP) -P $(GFLAGS) options > $(OPTIONS)
+ 
+ 
+ #------------------------------------------------------------------------------
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Gcc/general OpenFOAM-1.5/wmake/rules/linux64Gcc/general
+--- OpenFOAM-1.5.orig/wmake/rules/linux64Gcc/general	2008-05-01 17:16:40.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linux64Gcc/general	2010-07-02 00:07:27.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld -A64
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Gcc42/general OpenFOAM-1.5/wmake/rules/linux64Gcc42/general
+--- OpenFOAM-1.5.orig/wmake/rules/linux64Gcc42/general	2008-05-25 22:46:24.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linux64Gcc42/general	2010-07-02 00:08:59.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld -A64
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Icc/general OpenFOAM-1.5/wmake/rules/linux64Icc/general
+--- OpenFOAM-1.5.orig/wmake/rules/linux64Icc/general	2008-05-01 17:16:40.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linux64Icc/general	2010-07-02 00:10:09.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxGcc/general OpenFOAM-1.5/wmake/rules/linuxGcc/general
+--- OpenFOAM-1.5.orig/wmake/rules/linuxGcc/general	2008-05-01 17:16:40.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linuxGcc/general	2010-07-02 00:08:30.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld -melf_i386
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxGcc42/general OpenFOAM-1.5/wmake/rules/linuxGcc42/general
+--- OpenFOAM-1.5.orig/wmake/rules/linuxGcc42/general	2008-05-30 14:26:58.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linuxGcc42/general	2010-07-02 00:09:55.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld -melf_i386
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIA64Gcc/general OpenFOAM-1.5/wmake/rules/linuxIA64Gcc/general
+--- OpenFOAM-1.5.orig/wmake/rules/linuxIA64Gcc/general	2008-05-01 17:16:40.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linuxIA64Gcc/general	2010-07-02 00:07:43.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIA64Icc/general OpenFOAM-1.5/wmake/rules/linuxIA64Icc/general
+--- OpenFOAM-1.5.orig/wmake/rules/linuxIA64Icc/general	2008-05-01 17:16:40.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linuxIA64Icc/general	2010-07-02 00:06:11.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS) -DICC_IA64_PREFETCH
++CPP        = /lib/cpp -P $(GFLAGS) -DICC_IA64_PREFETCH
+ AR         = ar
+ ARFLAGS    = cr
+ RANLIB     = ranlib
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIcc/general OpenFOAM-1.5/wmake/rules/linuxIcc/general
+--- OpenFOAM-1.5.orig/wmake/rules/linuxIcc/general	2008-05-01 17:16:40.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linuxIcc/general	2010-07-02 00:08:18.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld -melf_i386
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxmingw32/general OpenFOAM-1.5/wmake/rules/linuxmingw32/general
+--- OpenFOAM-1.5.orig/wmake/rules/linuxmingw32/general	2008-05-01 17:16:40.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/linuxmingw32/general	2010-07-02 00:08:45.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = mingw32-ld
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT)
+diff -ur OpenFOAM-1.5.orig/wmake/rules/SiCortex64Gcc/general OpenFOAM-1.5/wmake/rules/SiCortex64Gcc/general
+--- OpenFOAM-1.5.orig/wmake/rules/SiCortex64Gcc/general	2010-07-02 00:12:08.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/SiCortex64Gcc/general	2010-07-02 00:06:28.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld -A64
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+diff -ur OpenFOAM-1.5.orig/wmake/rules/solarisGcc/general OpenFOAM-1.5/wmake/rules/solarisGcc/general
+--- OpenFOAM-1.5.orig/wmake/rules/solarisGcc/general	2008-05-01 17:16:40.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/solarisGcc/general	2010-07-02 00:10:28.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /usr/lib/cpp -undef $(GFLAGS)
++CPP        = /usr/lib/cpp -P -undef $(GFLAGS)
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
+ 
+diff -ur OpenFOAM-1.5.orig/wmake/rules/SunOS64Gcc/general OpenFOAM-1.5/wmake/rules/SunOS64Gcc/general
+--- OpenFOAM-1.5.orig/wmake/rules/SunOS64Gcc/general	2010-07-02 00:12:08.000000000 +0300
++++ OpenFOAM-1.5/wmake/rules/SunOS64Gcc/general	2010-07-02 00:08:00.000000000 +0300
+@@ -1,4 +1,4 @@
+-CPP        = /lib/cpp $(GFLAGS)
++CPP        = /lib/cpp -P $(GFLAGS)
+ LD         = ld -64
+ 
+ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream 
diff --git a/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild b/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild
index 8aee17e39ad1..dc847ae628c9 100644
--- a/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild
+++ b/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild,v 1.3 2009/09/25 09:31:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-kernel/openfoam-kernel-1.5_p20090311.ebuild,v 1.4 2010/07/01 21:24:24 ssuominen Exp $
 
 EAPI="2"
 
@@ -45,7 +45,7 @@ src_prepare() {
 	epatch "${DISTDIR}"/${MY_P}-svn.patch
 	epatch "${DISTDIR}"/${MY_PN}-git-${PVR}.patch
 	epatch "${FILESDIR}"/${MY_P}-ggi.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-gcc4{4,5}.patch
 }
 
 src_compile() {