/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch

https://gitlab.com/kogaion/portage · Patch · 243 lines · 193 code · 50 blank · 0 comment · 0 complexity · 7f4304d7233002076b45cd92ef4eac01 MD5 · raw file 

    

  1. --- make_linux.mak-	2012-07-02 00:49:48.729100052 +0000
    2. 

  2. +++ make_linux.mak	2012-07-02 00:53:16.753499389 +0000
    3. 

  3. @@ -66,7 +66,7 @@
    4. 

  4.  # Uncomment for Native Stats tool
    5. 

  5.  #NATIVE_STATS = -DNATIVE_STATS
    6. 

  6.  
    7. 

  7. -MOZILLACFLAGS = -O \
    8. 

  8. +MOZILLACFLAGS = $(CXXFLAGS) \
    9. 

  9.  	-DSWT_VERSION=$(SWT_VERSION) \
    10. 

  10.  	$(NATIVE_STATS) \
    11. 

  11.  	-DMOZILLA_STRICT_API=1 \
    12. 

  12. @@ -106,7 +106,7 @@
    13. 

  13.  WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
    14. 

  14.  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
    15. 

  15.  
    16. 

  16. -CFLAGS = -O -Wall \
    17. 

  17. +CFLAGS += \
    18. 

  18.  		-DSWT_VERSION=$(SWT_VERSION) \
    19. 

  19.  		$(NATIVE_STATS) \
    20. 

  20.  		-DLINUX -DGTK \
    21. 

  21. @@ -130,13 +130,13 @@
    22. 

  22.  make_swt: $(SWT_LIB) $(SWTPI_LIB)
    23. 

  23.  
    24. 

  24.  $(SWT_LIB): $(SWT_OBJECTS)
    25. 

  25. -	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
    26. 

  26. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
    27. 

  27.  
    28. 

  28.  callback.o: callback.c callback.h
    29. 

  29.  	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
    30. 

  30.  
    31. 

  31.  $(SWTPI_LIB): $(SWTPI_OBJECTS)
    32. 

  32. -	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
    33. 

  33. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
    34. 

  34.  
    35. 

  35.  swt.o: swt.c swt.h
    36. 

  36.  	$(CC) $(CFLAGS) -c swt.c
    37. 

  37. @@ -155,7 +155,7 @@
    38. 

  38.  make_cairo: $(CAIRO_LIB)
    39. 

  39.  
    40. 

  40.  $(CAIRO_LIB): $(CAIRO_OBJECTS)
    41. 

  41. -	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
    42. 

  42. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
    43. 

  43.  
    44. 

  44.  cairo.o: cairo.c cairo.h swt.h
    45. 

  45.  	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
    46. 

  46. @@ -171,7 +171,7 @@
    47. 

  47.  make_cde: $(CDE_LIB)
    48. 

  48.  
    49. 

  49.  $(CDE_LIB): $(CDE_OBJECTS)
    50. 

  50. -	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
    51. 

  51. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
    52. 

  52.  
    53. 

  53.  #
    54. 

  54.  # AWT lib
    55. 

  55. @@ -179,7 +179,7 @@
    56. 

  56.  make_awt:$(AWT_LIB)
    57. 

  57.  
    58. 

  58.  $(AWT_LIB): $(AWT_OBJECTS)
    59. 

  59. -	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
    60. 

  60. +	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
    61. 

  61.  
    62. 

  62.  #
    63. 

  63.  # Atk lib
    64. 

  64. @@ -187,7 +187,7 @@
    65. 

  65.  make_atk: $(ATK_LIB)
    66. 

  66.  
    67. 

  67.  $(ATK_LIB): $(ATK_OBJECTS)
    68. 

  68. -	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
    69. 

  69. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
    70. 

  70.  
    71. 

  71.  atk.o: atk.c atk.h
    72. 

  72.  	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
    73. 

  73. @@ -204,7 +204,7 @@
    74. 

  74.  make_gnome: $(GNOME_LIB)
    75. 

  75.  
    76. 

  76.  $(GNOME_LIB): $(GNOME_OBJECTS)
    77. 

  77. -	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
    78. 

  78. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
    79. 

  79.  
    80. 

  80.  gnome.o: gnome.c 
    81. 

  81.  	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
    82. 

  82. @@ -221,7 +221,7 @@
    83. 

  83.  make_mozilla:$(MOZILLA_LIB)
    84. 

  84.  
    85. 

  85.  $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
    86. 

  86. -	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
    87. 

  87. +	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
    88. 

  88.  
    89. 

  89.  xpcom.o: xpcom.cpp
    90. 

  90.  	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
    91. 

  91. @@ -242,7 +242,7 @@
    92. 

  92.  
    93. 

  93.  $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
    94. 

  94.  	echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so
    95. 

  95. -	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
    96. 

  96. +	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
    97. 

  97.  
    98. 

  98.  xpcomxul.o: xpcom.cpp
    99. 

  99.  	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
    100. 

  100. @@ -262,7 +262,7 @@
    101. 

  101.  make_xpcominit:$(XPCOMINIT_LIB)
    102. 

  102.  
    103. 

  103.  $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
    104. 

  104. -	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
    105. 

  105. +	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
    106. 

  106.  
    107. 

  107.  xpcominit.o: xpcominit.cpp
    108. 

  108.  	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
    109. 

  109. @@ -279,7 +279,7 @@
    110. 

  110.  make_webkit: $(WEBKIT_LIB)
    111. 

  111.  
    112. 

  112.  $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
    113. 

  113. -	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
    114. 

  114. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
    115. 

  115.  
    116. 

  116.  webkit.o: webkitgtk.c 
    117. 

  117.  	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
    118. 

  118. @@ -296,7 +296,7 @@
    119. 

  119.  make_glx: $(GLX_LIB)
    120. 

  120.  
    121. 

  121.  $(GLX_LIB): $(GLX_OBJECTS)
    122. 

  122. -	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
    123. 

  123. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
    124. 

  124.  
    125. 

  125.  glx.o: glx.c 
    126. 

  126.  	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
    127. 

  127. --- make_freebsd.mak-	2012-07-02 00:53:28.553351871 +0000
    128. 

  128. +++ make_freebsd.mak	2012-07-02 00:55:37.369741444 +0000
    129. 

  129. @@ -64,7 +64,7 @@
    130. 

  130.  # Uncomment for Native Stats tool
    131. 

  131.  #NATIVE_STATS = -DNATIVE_STATS
    132. 

  132.  
    133. 

  133. -MOZILLACFLAGS = -O \
    134. 

  134. +MOZILLACFLAGS += \
    135. 

  135.  	-DSWT_VERSION=$(SWT_VERSION) \
    136. 

  136.  	$(NATIVE_STATS) \
    137. 

  137.  	-DMOZILLA_STRICT_API=1 \
    138. 

  138. @@ -91,7 +91,7 @@
    139. 

  139.  XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
    140. 

  140.  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
    141. 

  141.  
    142. 

  142. -CFLAGS = -O -Wall \
    143. 

  143. +CFLAGS += \
    144. 

  144.  		-DSWT_VERSION=$(SWT_VERSION) \
    145. 

  145.  		$(NATIVE_STATS) \
    146. 

  146.  		-DFREEBSD -DGTK \
    147. 

  147. @@ -115,13 +115,13 @@
    148. 

  148.  make_swt: $(SWT_LIB) $(SWTPI_LIB)
    149. 

  149.  
    150. 

  150.  $(SWT_LIB): $(SWT_OBJECTS)
    151. 

  151. -	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
    152. 

  152. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
    153. 

  153.  
    154. 

  154.  callback.o: callback.c callback.h
    155. 

  155.  	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
    156. 

  156.  
    157. 

  157.  $(SWTPI_LIB): $(SWTPI_OBJECTS)
    158. 

  158. -	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
    159. 

  159. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
    160. 

  160.  
    161. 

  161.  swt.o: swt.c swt.h
    162. 

  162.  	$(CC) $(CFLAGS) -c swt.c
    163. 

  163. @@ -140,7 +140,7 @@
    164. 

  164.  make_cairo: $(CAIRO_LIB)
    165. 

  165.  
    166. 

  166.  $(CAIRO_LIB): $(CAIRO_OBJECTS)
    167. 

  167. -	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
    168. 

  168. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
    169. 

  169.  
    170. 

  170.  cairo.o: cairo.c cairo.h swt.h
    171. 

  171.  	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
    172. 

  172. @@ -156,7 +156,7 @@
    173. 

  173.  make_cde: $(CDE_LIB)
    174. 

  174.  
    175. 

  175.  $(CDE_LIB): $(CDE_OBJECTS)
    176. 

  176. -	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
    177. 

  177. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
    178. 

  178.  
    179. 

  179.  #
    180. 

  180.  # AWT lib
    181. 

  181. @@ -164,7 +164,7 @@
    182. 

  182.  make_awt:$(AWT_LIB)
    183. 

  183.  
    184. 

  184.  $(AWT_LIB): $(AWT_OBJECTS)
    185. 

  185. -	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
    186. 

  186. +	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
    187. 

  187.  
    188. 

  188.  #
    189. 

  189.  # Atk lib
    190. 

  190. @@ -172,7 +172,7 @@
    191. 

  191.  make_atk: $(ATK_LIB)
    192. 

  192.  
    193. 

  193.  $(ATK_LIB): $(ATK_OBJECTS)
    194. 

  194. -	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
    195. 

  195. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
    196. 

  196.  
    197. 

  197.  atk.o: atk.c atk.h
    198. 

  198.  	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
    199. 

  199. @@ -189,7 +189,7 @@
    200. 

  200.  make_gnome: $(GNOME_LIB)
    201. 

  201.  
    202. 

  202.  $(GNOME_LIB): $(GNOME_OBJECTS)
    203. 

  203. -	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
    204. 

  204. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
    205. 

  205.  
    206. 

  206.  gnome.o: gnome.c 
    207. 

  207.  	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
    208. 

  208. @@ -206,7 +206,7 @@
    209. 

  209.  make_mozilla:$(MOZILLA_LIB)
    210. 

  210.  
    211. 

  211.  $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
    212. 

  212. -	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
    213. 

  213. +	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
    214. 

  214.  
    215. 

  215.  xpcom.o: xpcom.cpp
    216. 

  216.  	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
    217. 

  217. @@ -226,7 +226,7 @@
    218. 

  218.  make_xulrunner:$(XULRUNNER_LIB)
    219. 

  219.  
    220. 

  220.  $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
    221. 

  221. -	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
    222. 

  222. +	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
    223. 

  223.  
    224. 

  224.  xpcomxul.o: xpcom.cpp
    225. 

  225.  	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
    226. 

  226. @@ -252,7 +252,7 @@
    227. 

  227.  make_xpcominit:$(XPCOMINIT_LIB)
    228. 

  228.  
    229. 

  229.  $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
    230. 

  230. -	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
    231. 

  231. +	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
    232. 

  232.  
    233. 

  233.  xpcominit.o: xpcominit.cpp
    234. 

  234.  	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
    235. 

  235. @@ -269,7 +269,7 @@
    236. 

  236.  make_glx: $(GLX_LIB)
    237. 

  237.  
    238. 

  238.  $(GLX_LIB): $(GLX_OBJECTS)
    239. 

  239. -	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
    240. 

  240. +	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
    241. 

  241.  
    242. 

  242.  glx.o: glx.c 
    243. 

  243.  	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
    244.