/sci-libs/openfoam-kernel/files/openfoam-kernel-1.5_p20090311-gcc45.patch

https://github.com/mikehale/portage · Patch · 132 lines · 115 code · 17 blank · 0 comment · 0 complexity · c36534e69c20968d2cadbbe6c08771d3 MD5 · raw file 

    

  1. diff -ur OpenFOAM-1.5.orig/wmake/MakefileFiles OpenFOAM-1.5/wmake/MakefileFiles
    2. 

  2. --- OpenFOAM-1.5.orig/wmake/MakefileFiles	2008-06-27 14:19:31.000000000 +0300
    3. 

  3. +++ OpenFOAM-1.5/wmake/MakefileFiles	2010-07-02 00:07:07.000000000 +0300
    4. 

  4. @@ -58,7 +58,7 @@
    5. 

  5.  allFiles : $(FILES) $(SFILES) $(OFILES) $(DFILES) $(IFILES)
    6. 

  6.  
    7. 

  7.  $(FILES) : files
    8. 

  8. -	@$(CPP) $(GFLAGS) $(FFLAGS) files > $(FILES)
    9. 

  9. +	@$(CPP) -P $(GFLAGS) $(FFLAGS) files > $(FILES)
    10. 

  10.  
    11. 

  11.  $(SFILES): files
    12. 

  12.  	@wmakeDerivedFiles
    13. 

  13. diff -ur OpenFOAM-1.5.orig/wmake/MakefileOptions OpenFOAM-1.5/wmake/MakefileOptions
    14. 

  14. --- OpenFOAM-1.5.orig/wmake/MakefileOptions	2010-07-02 00:12:07.000000000 +0300
    15. 

  15. +++ OpenFOAM-1.5/wmake/MakefileOptions	2010-07-02 00:05:52.000000000 +0300
    16. 

  16. @@ -48,7 +48,7 @@
    17. 

  17.  #------------------------------------------------------------------------------
    18. 

  18.  
    19. 

  19.  $(OPTIONS)  : options
    20. 

  20. -	@wmkdir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options > $(OPTIONS)
    21. 

  21. +	@wmkdir $(WM_OPTIONS) ; $(CPP) -P $(GFLAGS) options > $(OPTIONS)
    22. 

  22.  
    23. 

  23.  
    24. 

  24.  #------------------------------------------------------------------------------
    25. 

  25. diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Gcc/general OpenFOAM-1.5/wmake/rules/linux64Gcc/general
    26. 

  26. --- OpenFOAM-1.5.orig/wmake/rules/linux64Gcc/general	2008-05-01 17:16:40.000000000 +0300
    27. 

  27. +++ OpenFOAM-1.5/wmake/rules/linux64Gcc/general	2010-07-02 00:07:27.000000000 +0300
    28. 

  28. @@ -1,4 +1,4 @@
    29. 

  29. -CPP        = /lib/cpp $(GFLAGS)
    30. 

  30. +CPP        = /lib/cpp -P $(GFLAGS)
    31. 

  31.  LD         = ld -A64
    32. 

  32.  
    33. 

  33.  PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
    34. 

  34. diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Gcc42/general OpenFOAM-1.5/wmake/rules/linux64Gcc42/general
    35. 

  35. --- OpenFOAM-1.5.orig/wmake/rules/linux64Gcc42/general	2008-05-25 22:46:24.000000000 +0300
    36. 

  36. +++ OpenFOAM-1.5/wmake/rules/linux64Gcc42/general	2010-07-02 00:08:59.000000000 +0300
    37. 

  37. @@ -1,4 +1,4 @@
    38. 

  38. -CPP        = /lib/cpp $(GFLAGS)
    39. 

  39. +CPP        = /lib/cpp -P $(GFLAGS)
    40. 

  40.  LD         = ld -A64
    41. 

  41.  
    42. 

  42.  PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
    43. 

  43. diff -ur OpenFOAM-1.5.orig/wmake/rules/linux64Icc/general OpenFOAM-1.5/wmake/rules/linux64Icc/general
    44. 

  44. --- OpenFOAM-1.5.orig/wmake/rules/linux64Icc/general	2008-05-01 17:16:40.000000000 +0300
    45. 

  45. +++ OpenFOAM-1.5/wmake/rules/linux64Icc/general	2010-07-02 00:10:09.000000000 +0300
    46. 

  46. @@ -1,4 +1,4 @@
    47. 

  47. -CPP        = /lib/cpp $(GFLAGS)
    48. 

  48. +CPP        = /lib/cpp -P $(GFLAGS)
    49. 

  49.  LD         = ld
    50. 

  50.  
    51. 

  51.  PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
    52. 

  52. diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxGcc/general OpenFOAM-1.5/wmake/rules/linuxGcc/general
    53. 

  53. --- OpenFOAM-1.5.orig/wmake/rules/linuxGcc/general	2008-05-01 17:16:40.000000000 +0300
    54. 

  54. +++ OpenFOAM-1.5/wmake/rules/linuxGcc/general	2010-07-02 00:08:30.000000000 +0300
    55. 

  55. @@ -1,4 +1,4 @@
    56. 

  56. -CPP        = /lib/cpp $(GFLAGS)
    57. 

  57. +CPP        = /lib/cpp -P $(GFLAGS)
    58. 

  58.  LD         = ld -melf_i386
    59. 

  59.  
    60. 

  60.  PROJECT_LIBS = -l$(WM_PROJECT) -ldl
    61. 

  61. diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxGcc42/general OpenFOAM-1.5/wmake/rules/linuxGcc42/general
    62. 

  62. --- OpenFOAM-1.5.orig/wmake/rules/linuxGcc42/general	2008-05-30 14:26:58.000000000 +0300
    63. 

  63. +++ OpenFOAM-1.5/wmake/rules/linuxGcc42/general	2010-07-02 00:09:55.000000000 +0300
    64. 

  64. @@ -1,4 +1,4 @@
    65. 

  65. -CPP        = /lib/cpp $(GFLAGS)
    66. 

  66. +CPP        = /lib/cpp -P $(GFLAGS)
    67. 

  67.  LD         = ld -melf_i386
    68. 

  68.  
    69. 

  69.  PROJECT_LIBS = -l$(WM_PROJECT) -ldl
    70. 

  70. diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIA64Gcc/general OpenFOAM-1.5/wmake/rules/linuxIA64Gcc/general
    71. 

  71. --- OpenFOAM-1.5.orig/wmake/rules/linuxIA64Gcc/general	2008-05-01 17:16:40.000000000 +0300
    72. 

  72. +++ OpenFOAM-1.5/wmake/rules/linuxIA64Gcc/general	2010-07-02 00:07:43.000000000 +0300
    73. 

  73. @@ -1,4 +1,4 @@
    74. 

  74. -CPP        = /lib/cpp $(GFLAGS)
    75. 

  75. +CPP        = /lib/cpp -P $(GFLAGS)
    76. 

  76.  LD         = ld
    77. 

  77.  
    78. 

  78.  PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
    79. 

  79. diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIA64Icc/general OpenFOAM-1.5/wmake/rules/linuxIA64Icc/general
    80. 

  80. --- OpenFOAM-1.5.orig/wmake/rules/linuxIA64Icc/general	2008-05-01 17:16:40.000000000 +0300
    81. 

  81. +++ OpenFOAM-1.5/wmake/rules/linuxIA64Icc/general	2010-07-02 00:06:11.000000000 +0300
    82. 

  82. @@ -1,4 +1,4 @@
    83. 

  83. -CPP        = /lib/cpp $(GFLAGS) -DICC_IA64_PREFETCH
    84. 

  84. +CPP        = /lib/cpp -P $(GFLAGS) -DICC_IA64_PREFETCH
    85. 

  85.  AR         = ar
    86. 

  86.  ARFLAGS    = cr
    87. 

  87.  RANLIB     = ranlib
    88. 

  88. diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxIcc/general OpenFOAM-1.5/wmake/rules/linuxIcc/general
    89. 

  89. --- OpenFOAM-1.5.orig/wmake/rules/linuxIcc/general	2008-05-01 17:16:40.000000000 +0300
    90. 

  90. +++ OpenFOAM-1.5/wmake/rules/linuxIcc/general	2010-07-02 00:08:18.000000000 +0300
    91. 

  91. @@ -1,4 +1,4 @@
    92. 

  92. -CPP        = /lib/cpp $(GFLAGS)
    93. 

  93. +CPP        = /lib/cpp -P $(GFLAGS)
    94. 

  94.  LD         = ld -melf_i386
    95. 

  95.  
    96. 

  96.  PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
    97. 

  97. diff -ur OpenFOAM-1.5.orig/wmake/rules/linuxmingw32/general OpenFOAM-1.5/wmake/rules/linuxmingw32/general
    98. 

  98. --- OpenFOAM-1.5.orig/wmake/rules/linuxmingw32/general	2008-05-01 17:16:40.000000000 +0300
    99. 

  99. +++ OpenFOAM-1.5/wmake/rules/linuxmingw32/general	2010-07-02 00:08:45.000000000 +0300
    100. 

  100. @@ -1,4 +1,4 @@
    101. 

  101. -CPP        = /lib/cpp $(GFLAGS)
    102. 

  102. +CPP        = /lib/cpp -P $(GFLAGS)
    103. 

  103.  LD         = mingw32-ld
    104. 

  104.  
    105. 

  105.  PROJECT_LIBS = -l$(WM_PROJECT)
    106. 

  106. diff -ur OpenFOAM-1.5.orig/wmake/rules/SiCortex64Gcc/general OpenFOAM-1.5/wmake/rules/SiCortex64Gcc/general
    107. 

  107. --- OpenFOAM-1.5.orig/wmake/rules/SiCortex64Gcc/general	2010-07-02 00:12:08.000000000 +0300
    108. 

  108. +++ OpenFOAM-1.5/wmake/rules/SiCortex64Gcc/general	2010-07-02 00:06:28.000000000 +0300
    109. 

  109. @@ -1,4 +1,4 @@
    110. 

  110. -CPP        = /lib/cpp $(GFLAGS)
    111. 

  111. +CPP        = /lib/cpp -P $(GFLAGS)
    112. 

  112.  LD         = ld -A64
    113. 

  113.  
    114. 

  114.  PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
    115. 

  115. diff -ur OpenFOAM-1.5.orig/wmake/rules/solarisGcc/general OpenFOAM-1.5/wmake/rules/solarisGcc/general
    116. 

  116. --- OpenFOAM-1.5.orig/wmake/rules/solarisGcc/general	2008-05-01 17:16:40.000000000 +0300
    117. 

  117. +++ OpenFOAM-1.5/wmake/rules/solarisGcc/general	2010-07-02 00:10:28.000000000 +0300
    118. 

  118. @@ -1,4 +1,4 @@
    119. 

  119. -CPP        = /usr/lib/cpp -undef $(GFLAGS)
    120. 

  120. +CPP        = /usr/lib/cpp -P -undef $(GFLAGS)
    121. 

  121.  
    122. 

  122.  PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
    123. 

  123.  
    124. 

  124. diff -ur OpenFOAM-1.5.orig/wmake/rules/SunOS64Gcc/general OpenFOAM-1.5/wmake/rules/SunOS64Gcc/general
    125. 

  125. --- OpenFOAM-1.5.orig/wmake/rules/SunOS64Gcc/general	2010-07-02 00:12:08.000000000 +0300
    126. 

  126. +++ OpenFOAM-1.5/wmake/rules/SunOS64Gcc/general	2010-07-02 00:08:00.000000000 +0300
    127. 

  127. @@ -1,4 +1,4 @@
    128. 

  128. -CPP        = /lib/cpp $(GFLAGS)
    129. 

  129. +CPP        = /lib/cpp -P $(GFLAGS)
    130. 

  130.  LD         = ld -64
    131. 

  131.  
    132. 

  132.  PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
    133.