| 1 |
ssuominen 10/07/01 21:24:24 |
| 2 |
|
| 3 |
Added: openfoam-kernel-1.5_p20090311-gcc45.patch |
| 4 |
Log: |
| 5 |
Fix building with GCC 4.5+ wrt #326519. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc45.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc45.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc45.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: openfoam-kernel-1.5_p20090311-gcc45.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur OpenFOAM-1.5.orig/wmake/MakefileFiles OpenFOAM-1.5/wmake/MakefileFiles |
| 17 |
--- OpenFOAM-1.5.orig/wmake/MakefileFiles 2008-06-27 14:19:31.000000000 +0300 |
| 18 |
+++ OpenFOAM-1.5/wmake/MakefileFiles 2010-07-02 00:07:07.000000000 +0300 |
| 19 |
@@ -58,7 +58,7 @@ |
| 20 |
allFiles : $(FILES) $(SFILES) $(OFILES) $(DFILES) $(IFILES) |
| 21 |
|
| 22 |
$(FILES) : files |
| 23 |
- @$(CPP) $(GFLAGS) $(FFLAGS) files > $(FILES) |
| 24 |
+ @$(CPP) -P $(GFLAGS) $(FFLAGS) files > $(FILES) |
| 25 |
|
| 26 |
$(SFILES): files |
| 27 |
@wmakeDerivedFiles |
| 28 |
diff -ur OpenFOAM-1.5.orig/wmake/MakefileOptions OpenFOAM-1.5/wmake/MakefileOptions |
| 29 |
--- OpenFOAM-1.5.orig/wmake/MakefileOptions 2010-07-02 00:12:07.000000000 +0300 |
| 30 |
+++ OpenFOAM-1.5/wmake/MakefileOptions 2010-07-02 00:05:52.000000000 +0300 |
| 31 |
@@ -48,7 +48,7 @@ |
| 32 |
#------------------------------------------------------------------------------ |
| 33 |
|
| 34 |
$(OPTIONS) : options |
| 35 |
- @wmkdir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options > $(OPTIONS) |
| 36 |
+ @wmkdir $(WM_OPTIONS) ; $(CPP) -P $(GFLAGS) options > $(OPTIONS) |
| 37 |
|
| 38 |
|
| 39 |
#------------------------------------------------------------------------------ |
| 40 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Gcc/general OpenFOAM-1.5/wmake/rules/linux64Gcc/general |
| 41 |
--- OpenFOAM-1.5.orig/wmake/rules/linux64Gcc/general 2008-05-01 17:16:40.000000000 +0300 |
| 42 |
+++ OpenFOAM-1.5/wmake/rules/linux64Gcc/general 2010-07-02 00:07:27.000000000 +0300 |
| 43 |
@@ -1,4 +1,4 @@ |
| 44 |
-CPP = /lib/cpp $(GFLAGS) |
| 45 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 46 |
LD = ld -A64 |
| 47 |
|
| 48 |
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl |
| 49 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Gcc42/general OpenFOAM-1.5/wmake/rules/linux64Gcc42/general |
| 50 |
--- OpenFOAM-1.5.orig/wmake/rules/linux64Gcc42/general 2008-05-25 22:46:24.000000000 +0300 |
| 51 |
+++ OpenFOAM-1.5/wmake/rules/linux64Gcc42/general 2010-07-02 00:08:59.000000000 +0300 |
| 52 |
@@ -1,4 +1,4 @@ |
| 53 |
-CPP = /lib/cpp $(GFLAGS) |
| 54 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 55 |
LD = ld -A64 |
| 56 |
|
| 57 |
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl |
| 58 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Icc/general OpenFOAM-1.5/wmake/rules/linux64Icc/general |
| 59 |
--- OpenFOAM-1.5.orig/wmake/rules/linux64Icc/general 2008-05-01 17:16:40.000000000 +0300 |
| 60 |
+++ OpenFOAM-1.5/wmake/rules/linux64Icc/general 2010-07-02 00:10:09.000000000 +0300 |
| 61 |
@@ -1,4 +1,4 @@ |
| 62 |
-CPP = /lib/cpp $(GFLAGS) |
| 63 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 64 |
LD = ld |
| 65 |
|
| 66 |
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl |
| 67 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxGcc/general OpenFOAM-1.5/wmake/rules/linuxGcc/general |
| 68 |
--- OpenFOAM-1.5.orig/wmake/rules/linuxGcc/general 2008-05-01 17:16:40.000000000 +0300 |
| 69 |
+++ OpenFOAM-1.5/wmake/rules/linuxGcc/general 2010-07-02 00:08:30.000000000 +0300 |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-CPP = /lib/cpp $(GFLAGS) |
| 72 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 73 |
LD = ld -melf_i386 |
| 74 |
|
| 75 |
PROJECT_LIBS = -l$(WM_PROJECT) -ldl |
| 76 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxGcc42/general OpenFOAM-1.5/wmake/rules/linuxGcc42/general |
| 77 |
--- OpenFOAM-1.5.orig/wmake/rules/linuxGcc42/general 2008-05-30 14:26:58.000000000 +0300 |
| 78 |
+++ OpenFOAM-1.5/wmake/rules/linuxGcc42/general 2010-07-02 00:09:55.000000000 +0300 |
| 79 |
@@ -1,4 +1,4 @@ |
| 80 |
-CPP = /lib/cpp $(GFLAGS) |
| 81 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 82 |
LD = ld -melf_i386 |
| 83 |
|
| 84 |
PROJECT_LIBS = -l$(WM_PROJECT) -ldl |
| 85 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIA64Gcc/general OpenFOAM-1.5/wmake/rules/linuxIA64Gcc/general |
| 86 |
--- OpenFOAM-1.5.orig/wmake/rules/linuxIA64Gcc/general 2008-05-01 17:16:40.000000000 +0300 |
| 87 |
+++ OpenFOAM-1.5/wmake/rules/linuxIA64Gcc/general 2010-07-02 00:07:43.000000000 +0300 |
| 88 |
@@ -1,4 +1,4 @@ |
| 89 |
-CPP = /lib/cpp $(GFLAGS) |
| 90 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 91 |
LD = ld |
| 92 |
|
| 93 |
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl |
| 94 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIA64Icc/general OpenFOAM-1.5/wmake/rules/linuxIA64Icc/general |
| 95 |
--- OpenFOAM-1.5.orig/wmake/rules/linuxIA64Icc/general 2008-05-01 17:16:40.000000000 +0300 |
| 96 |
+++ OpenFOAM-1.5/wmake/rules/linuxIA64Icc/general 2010-07-02 00:06:11.000000000 +0300 |
| 97 |
@@ -1,4 +1,4 @@ |
| 98 |
-CPP = /lib/cpp $(GFLAGS) -DICC_IA64_PREFETCH |
| 99 |
+CPP = /lib/cpp -P $(GFLAGS) -DICC_IA64_PREFETCH |
| 100 |
AR = ar |
| 101 |
ARFLAGS = cr |
| 102 |
RANLIB = ranlib |
| 103 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIcc/general OpenFOAM-1.5/wmake/rules/linuxIcc/general |
| 104 |
--- OpenFOAM-1.5.orig/wmake/rules/linuxIcc/general 2008-05-01 17:16:40.000000000 +0300 |
| 105 |
+++ OpenFOAM-1.5/wmake/rules/linuxIcc/general 2010-07-02 00:08:18.000000000 +0300 |
| 106 |
@@ -1,4 +1,4 @@ |
| 107 |
-CPP = /lib/cpp $(GFLAGS) |
| 108 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 109 |
LD = ld -melf_i386 |
| 110 |
|
| 111 |
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl |
| 112 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxmingw32/general OpenFOAM-1.5/wmake/rules/linuxmingw32/general |
| 113 |
--- OpenFOAM-1.5.orig/wmake/rules/linuxmingw32/general 2008-05-01 17:16:40.000000000 +0300 |
| 114 |
+++ OpenFOAM-1.5/wmake/rules/linuxmingw32/general 2010-07-02 00:08:45.000000000 +0300 |
| 115 |
@@ -1,4 +1,4 @@ |
| 116 |
-CPP = /lib/cpp $(GFLAGS) |
| 117 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 118 |
LD = mingw32-ld |
| 119 |
|
| 120 |
PROJECT_LIBS = -l$(WM_PROJECT) |
| 121 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/SiCortex64Gcc/general OpenFOAM-1.5/wmake/rules/SiCortex64Gcc/general |
| 122 |
--- OpenFOAM-1.5.orig/wmake/rules/SiCortex64Gcc/general 2010-07-02 00:12:08.000000000 +0300 |
| 123 |
+++ OpenFOAM-1.5/wmake/rules/SiCortex64Gcc/general 2010-07-02 00:06:28.000000000 +0300 |
| 124 |
@@ -1,4 +1,4 @@ |
| 125 |
-CPP = /lib/cpp $(GFLAGS) |
| 126 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 127 |
LD = ld -A64 |
| 128 |
|
| 129 |
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl |
| 130 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/solarisGcc/general OpenFOAM-1.5/wmake/rules/solarisGcc/general |
| 131 |
--- OpenFOAM-1.5.orig/wmake/rules/solarisGcc/general 2008-05-01 17:16:40.000000000 +0300 |
| 132 |
+++ OpenFOAM-1.5/wmake/rules/solarisGcc/general 2010-07-02 00:10:28.000000000 +0300 |
| 133 |
@@ -1,4 +1,4 @@ |
| 134 |
-CPP = /usr/lib/cpp -undef $(GFLAGS) |
| 135 |
+CPP = /usr/lib/cpp -P -undef $(GFLAGS) |
| 136 |
|
| 137 |
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream |
| 138 |
|
| 139 |
diff -ur OpenFOAM-1.5.orig/wmake/rules/SunOS64Gcc/general OpenFOAM-1.5/wmake/rules/SunOS64Gcc/general |
| 140 |
--- OpenFOAM-1.5.orig/wmake/rules/SunOS64Gcc/general 2010-07-02 00:12:08.000000000 +0300 |
| 141 |
+++ OpenFOAM-1.5/wmake/rules/SunOS64Gcc/general 2010-07-02 00:08:00.000000000 +0300 |
| 142 |
@@ -1,4 +1,4 @@ |
| 143 |
-CPP = /lib/cpp $(GFLAGS) |
| 144 |
+CPP = /lib/cpp -P $(GFLAGS) |
| 145 |
LD = ld -64 |
| 146 |
|
| 147 |
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream |
Archives