1 |
commit: b25f82e790bbcf0f05f434212958ae2e192df08e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 22 00:46:37 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 22 00:46:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25f82e7 |
7 |
|
8 |
dev-lang/ocaml: scrub patches |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch | 20 +++++++++--------- |
13 |
dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch | 15 -------------- |
14 |
dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch | 24 +++++++++++----------- |
15 |
dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch | 15 -------------- |
16 |
dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch | 16 +++++++-------- |
17 |
dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch | 18 ---------------- |
18 |
6 files changed, 30 insertions(+), 78 deletions(-) |
19 |
|
20 |
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch |
21 |
index a0c67da534a0..8b2e99883167 100644 |
22 |
--- a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch |
23 |
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch |
24 |
@@ -1,5 +1,5 @@ |
25 |
---- a/byterun/caml/intext.h 2021-01-28 22:46:20.400224678 +0100 |
26 |
-+++ b/byterun/caml/intext.h 2021-01-28 22:46:49.312751054 +0100 |
27 |
+--- a/byterun/caml/intext.h |
28 |
++++ b/byterun/caml/intext.h |
29 |
@@ -196,7 +196,7 @@ |
30 |
|
31 |
CAMLextern struct code_fragment * caml_extern_find_code(char *addr); |
32 |
@@ -9,8 +9,8 @@ |
33 |
|
34 |
#endif /* CAML_INTERNALS */ |
35 |
|
36 |
---- a/byterun/caml/major_gc.h 2021-01-28 22:44:12.193323457 +0100 |
37 |
-+++ b/byterun/caml/major_gc.h 2021-01-28 22:45:20.918198701 +0100 |
38 |
+--- a/byterun/caml/major_gc.h |
39 |
++++ b/byterun/caml/major_gc.h |
40 |
@@ -64,9 +64,9 @@ |
41 |
extern char *caml_gc_sweep_hp; |
42 |
|
43 |
@@ -24,8 +24,8 @@ |
44 |
extern double caml_gc_clock; |
45 |
|
46 |
/* [caml_major_gc_hook] is called just between the end of the mark |
47 |
---- a/byterun/meta.c 2021-01-28 22:47:34.148016359 +0100 |
48 |
-+++ b/byterun/meta.c 2021-01-28 22:47:56.048657393 +0100 |
49 |
+--- a/byterun/meta.c |
50 |
++++ b/byterun/meta.c |
51 |
@@ -32,6 +32,8 @@ |
52 |
#include "caml/prims.h" |
53 |
#include "caml/stacks.h" |
54 |
@@ -35,8 +35,8 @@ |
55 |
#ifndef NATIVE_CODE |
56 |
|
57 |
CAMLprim value caml_get_global_data(value unit) |
58 |
---- a/byterun/backtrace.c 2021-01-28 22:50:25.275226598 +0100 |
59 |
-+++ b/byterun/backtrace.c 2021-01-28 22:50:37.541027290 +0100 |
60 |
+--- a/byterun/backtrace.c |
61 |
++++ b/byterun/backtrace.c |
62 |
@@ -28,7 +28,7 @@ |
63 |
#include "caml/fail.h" |
64 |
|
65 |
@@ -46,8 +46,8 @@ |
66 |
|
67 |
CAMLexport int32_t caml_backtrace_active = 0; |
68 |
CAMLexport int32_t caml_backtrace_pos = 0; |
69 |
---- a/asmrun/startup.c 2021-01-28 23:02:50.526072662 +0100 |
70 |
-+++ b/asmrun/startup.c 2021-01-28 23:03:09.977754311 +0100 |
71 |
+--- a/asmrun/startup.c |
72 |
++++ b/asmrun/startup.c |
73 |
@@ -44,7 +44,7 @@ |
74 |
#endif |
75 |
|
76 |
|
77 |
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch |
78 |
index 28d7f48f5b27..d95d2bb0fa50 100644 |
79 |
--- a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch |
80 |
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch |
81 |
@@ -18,15 +18,6 @@ The alternate signal stack is freed when the main OCaml code / an OCaml thread |
82 |
stops. |
83 |
|
84 |
(partial back-port of PR#10266 and PR#10726) |
85 |
---- |
86 |
- asmrun/fail.c | 7 ++++- |
87 |
- asmrun/signals_asm.c | 69 ++++++++++++++++++++++++++++++++++++++------ |
88 |
- asmrun/startup.c | 7 ++++- |
89 |
- byterun/sys.c | 5 ++++ |
90 |
- 4 files changed, 77 insertions(+), 11 deletions(-) |
91 |
- |
92 |
-diff --git a/asmrun/fail.c b/asmrun/fail.c |
93 |
-index d73cb88524c..2f064320185 100644 |
94 |
--- a/asmrun/fail.c |
95 |
+++ b/asmrun/fail.c |
96 |
@@ -31,6 +31,8 @@ |
97 |
@@ -50,8 +41,6 @@ index d73cb88524c..2f064320185 100644 |
98 |
|
99 |
#ifndef Stack_grows_upwards |
100 |
#define PUSHED_AFTER < |
101 |
-diff --git a/asmrun/signals_asm.c b/asmrun/signals_asm.c |
102 |
-index f124a076749..b4e2516ae1a 100644 |
103 |
--- a/asmrun/signals_asm.c |
104 |
+++ b/asmrun/signals_asm.c |
105 |
@@ -194,7 +194,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler) |
106 |
@@ -140,8 +129,6 @@ index f124a076749..b4e2516ae1a 100644 |
107 |
+ } |
108 |
+#endif |
109 |
+} |
110 |
-diff --git a/asmrun/startup.c b/asmrun/startup.c |
111 |
-index 70bbc4369dc..a1cb06a7d1e 100644 |
112 |
--- a/asmrun/startup.c |
113 |
+++ b/asmrun/startup.c |
114 |
@@ -92,6 +92,7 @@ void (*caml_termination_hook)(void *) = NULL; |
115 |
@@ -175,8 +162,6 @@ index 70bbc4369dc..a1cb06a7d1e 100644 |
116 |
} |
117 |
|
118 |
void caml_startup(char **argv) |
119 |
-diff --git a/byterun/sys.c b/byterun/sys.c |
120 |
-index 3706e9002d5..aa152239ebf 100644 |
121 |
--- a/byterun/sys.c |
122 |
+++ b/byterun/sys.c |
123 |
@@ -111,6 +111,8 @@ static void caml_sys_check_path(value name) |
124 |
|
125 |
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch |
126 |
index 8d2391407a35..d0a947da0ea6 100644 |
127 |
--- a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch |
128 |
+++ b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch |
129 |
@@ -1,5 +1,5 @@ |
130 |
---- a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100 |
131 |
-+++ b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100 |
132 |
+--- a/runtime/Makefile |
133 |
++++ b/runtime/Makefile |
134 |
@@ -335,7 +335,7 @@ |
135 |
# (without the extension, which is added by the macro) |
136 |
define COMPILE_C_FILE |
137 |
@@ -9,24 +9,24 @@ |
138 |
endef |
139 |
|
140 |
object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic |
141 |
---- a/yacc/Makefile 2022-01-22 20:02:56.510340885 +0100 |
142 |
-+++ b/yacc/Makefile 2022-01-22 20:03:14.998000508 +0100 |
143 |
+--- a/yacc/Makefile |
144 |
++++ b/yacc/Makefile |
145 |
@@ -63,4 +63,4 @@ |
146 |
# also works for .obj files. |
147 |
|
148 |
%.$(O): %.c |
149 |
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
150 |
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
151 |
---- a/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:15.316779625 +0100 |
152 |
-+++ b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701 +0100 |
153 |
+--- a/otherlibs/Makefile.otherlibs.common |
154 |
++++ b/otherlibs/Makefile.otherlibs.common |
155 |
@@ -138,4 +138,4 @@ |
156 |
$(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $< |
157 |
|
158 |
.c.$(O): |
159 |
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
160 |
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
161 |
---- a/ocamltest/Makefile 2022-01-22 20:30:22.454009704 +0100 |
162 |
-+++ b/ocamltest/Makefile 2022-01-22 20:30:33.845799603 +0100 |
163 |
+--- a/ocamltest/Makefile |
164 |
++++ b/ocamltest/Makefile |
165 |
@@ -221,7 +221,7 @@ |
166 |
$(ocamllex) -q $< |
167 |
|
168 |
@@ -36,8 +36,8 @@ |
169 |
|
170 |
ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config |
171 |
sed \ |
172 |
---- a/otherlibs/systhreads/Makefile 2022-01-22 20:42:17.647349876 +0100 |
173 |
-+++ b/otherlibs/systhreads/Makefile 2022-01-22 20:43:29.766086103 +0100 |
174 |
+--- a/otherlibs/systhreads/Makefile |
175 |
++++ b/otherlibs/systhreads/Makefile |
176 |
@@ -93,11 +93,11 @@ |
177 |
# twice, each time with different options). |
178 |
|
179 |
@@ -52,8 +52,8 @@ |
180 |
-I$(ROOTDIR)/runtime $(SHAREDLIB_CFLAGS) -DNATIVE_CODE \ |
181 |
-DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \ |
182 |
$(OUTPUTOBJ)$@ -c $< |
183 |
---- a/tools/Makefile 2022-01-23 09:57:00.788877931 +0100 |
184 |
-+++ b/tools/Makefile 2022-01-23 09:57:21.735516656 +0100 |
185 |
+--- a/tools/Makefile |
186 |
++++ b/tools/Makefile |
187 |
@@ -322,7 +322,7 @@ |
188 |
endif |
189 |
|
190 |
|
191 |
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch |
192 |
index 6f74d38e80b6..48127343a3f4 100644 |
193 |
--- a/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch |
194 |
+++ b/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch |
195 |
@@ -18,15 +18,6 @@ The alternate signal stack is freed when the main OCaml code / an OCaml thread |
196 |
stops. |
197 |
|
198 |
(partial back-port of PR#10266 and PR#10726) |
199 |
---- |
200 |
- runtime/fail_nat.c | 7 ++++- |
201 |
- runtime/signals_nat.c | 64 +++++++++++++++++++++++++++++++++++++------ |
202 |
- runtime/startup_nat.c | 7 ++++- |
203 |
- runtime/sys.c | 5 ++++ |
204 |
- 4 files changed, 72 insertions(+), 11 deletions(-) |
205 |
- |
206 |
-diff --git a/runtime/fail_nat.c b/runtime/fail_nat.c |
207 |
-index e1f687d379e..cbf7633ee9e 100644 |
208 |
--- a/runtime/fail_nat.c |
209 |
+++ b/runtime/fail_nat.c |
210 |
@@ -31,6 +31,8 @@ |
211 |
@@ -50,8 +41,6 @@ index e1f687d379e..cbf7633ee9e 100644 |
212 |
|
213 |
while (caml_local_roots != NULL && |
214 |
(char *) caml_local_roots < caml_exception_pointer) { |
215 |
-diff --git a/runtime/signals_nat.c b/runtime/signals_nat.c |
216 |
-index 29a5f49e625..351b575a08e 100644 |
217 |
--- a/runtime/signals_nat.c |
218 |
+++ b/runtime/signals_nat.c |
219 |
@@ -182,7 +182,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler) |
220 |
@@ -132,8 +121,6 @@ index 29a5f49e625..351b575a08e 100644 |
221 |
} |
222 |
#endif |
223 |
} |
224 |
-diff --git a/runtime/startup_nat.c b/runtime/startup_nat.c |
225 |
-index 7eca5fa5581..f52bec980b6 100644 |
226 |
--- a/runtime/startup_nat.c |
227 |
+++ b/runtime/startup_nat.c |
228 |
@@ -92,6 +92,7 @@ void (*caml_termination_hook)(void *) = NULL; |
229 |
@@ -167,8 +154,6 @@ index 7eca5fa5581..f52bec980b6 100644 |
230 |
} |
231 |
|
232 |
value caml_startup_exn(char_os **argv) |
233 |
-diff --git a/runtime/sys.c b/runtime/sys.c |
234 |
-index 226d596cdff..9e201354e1e 100644 |
235 |
--- a/runtime/sys.c |
236 |
+++ b/runtime/sys.c |
237 |
@@ -112,6 +112,8 @@ static void caml_sys_check_path(value name) |
238 |
|
239 |
diff --git a/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch |
240 |
index 01117c39887d..7adb1ea0768d 100644 |
241 |
--- a/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch |
242 |
+++ b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch |
243 |
@@ -1,5 +1,5 @@ |
244 |
---- a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100 |
245 |
-+++ b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100 |
246 |
+--- a/runtime/Makefile |
247 |
++++ b/runtime/Makefile |
248 |
@@ -335,7 +335,7 @@ |
249 |
# (without the extension, which is added by the macro) |
250 |
define COMPILE_C_FILE |
251 |
@@ -9,16 +9,16 @@ |
252 |
endef |
253 |
|
254 |
object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic |
255 |
---- a/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:15.316779625 +0100 |
256 |
-+++ b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701 +0100 |
257 |
+--- a/otherlibs/Makefile.otherlibs.common |
258 |
++++ b/otherlibs/Makefile.otherlibs.common |
259 |
@@ -138,4 +138,4 @@ |
260 |
$(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $< |
261 |
|
262 |
.c.$(O): |
263 |
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
264 |
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
265 |
---- a/otherlibs/systhreads/Makefile 2022-01-22 20:42:17.647349876 +0100 |
266 |
-+++ b/otherlibs/systhreads/Makefile 2022-01-22 20:43:29.766086103 +0100 |
267 |
+--- a/otherlibs/systhreads/Makefile |
268 |
++++ b/otherlibs/systhreads/Makefile |
269 |
@@ -102,10 +102,10 @@ |
270 |
st_stubs_n.$(O): OC_CPPFLAGS += $(NATIVE_CPPFLAGS) |
271 |
|
272 |
@@ -32,8 +32,8 @@ |
273 |
|
274 |
partialclean: |
275 |
rm -f *.cm* |
276 |
---- a/Makefile.common.in 2022-01-23 18:05:04.192323554 +0100 |
277 |
-+++ b/Makefile.common.in 2022-01-23 18:05:17.211122643 +0100 |
278 |
+--- a/Makefile.common.in |
279 |
++++ b/Makefile.common.in |
280 |
@@ -79,4 +79,4 @@ |
281 |
# general (it supports both .o and .obj) |
282 |
|
283 |
|
284 |
diff --git a/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch |
285 |
index 8ce76701366a..4c157ddd90b8 100644 |
286 |
--- a/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch |
287 |
+++ b/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch |
288 |
@@ -18,16 +18,6 @@ The alternate signal stack is freed when the main OCaml code / an OCaml thread |
289 |
stops. |
290 |
|
291 |
(partial back-port of PR#10266 and PR#10726) |
292 |
---- |
293 |
- otherlibs/systhreads/st_stubs.c | 2 + |
294 |
- runtime/fail_nat.c | 7 ++- |
295 |
- runtime/signals_nat.c | 87 ++++++++++++++++++++++++++++----- |
296 |
- runtime/startup_nat.c | 7 ++- |
297 |
- runtime/sys.c | 5 ++ |
298 |
- 5 files changed, 95 insertions(+), 13 deletions(-) |
299 |
- |
300 |
-diff --git a/otherlibs/systhreads/st_stubs.c b/otherlibs/systhreads/st_stubs.c |
301 |
-index e46a67be9dc..0b441934ae9 100644 |
302 |
--- a/otherlibs/systhreads/st_stubs.c |
303 |
+++ b/otherlibs/systhreads/st_stubs.c |
304 |
@@ -140,6 +140,7 @@ static st_retcode caml_threadstatus_wait (value); |
305 |
@@ -46,8 +36,6 @@ index e46a67be9dc..0b441934ae9 100644 |
306 |
#endif |
307 |
/* The thread now stops running */ |
308 |
return 0; |
309 |
-diff --git a/runtime/fail_nat.c b/runtime/fail_nat.c |
310 |
-index 380578ac47b..4ea658684b4 100644 |
311 |
--- a/runtime/fail_nat.c |
312 |
+++ b/runtime/fail_nat.c |
313 |
@@ -32,6 +32,8 @@ |
314 |
@@ -71,8 +59,6 @@ index 380578ac47b..4ea658684b4 100644 |
315 |
|
316 |
while (Caml_state->local_roots != NULL && |
317 |
(char *) Caml_state->local_roots < Caml_state->exception_pointer) { |
318 |
-diff --git a/runtime/signals_nat.c b/runtime/signals_nat.c |
319 |
-index 017298394e9..b4c58259fc2 100644 |
320 |
--- a/runtime/signals_nat.c |
321 |
+++ b/runtime/signals_nat.c |
322 |
@@ -191,8 +191,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler) |
323 |
@@ -196,8 +182,6 @@ index 017298394e9..b4c58259fc2 100644 |
324 |
+ return 0; |
325 |
#endif |
326 |
} |
327 |
-diff --git a/runtime/startup_nat.c b/runtime/startup_nat.c |
328 |
-index 91ff81b3fac..b80d0ffbd5e 100644 |
329 |
--- a/runtime/startup_nat.c |
330 |
+++ b/runtime/startup_nat.c |
331 |
@@ -93,6 +93,7 @@ void (*caml_termination_hook)(void *) = NULL; |
332 |
@@ -231,8 +215,6 @@ index 91ff81b3fac..b80d0ffbd5e 100644 |
333 |
} |
334 |
|
335 |
value caml_startup_exn(char_os **argv) |
336 |
-diff --git a/runtime/sys.c b/runtime/sys.c |
337 |
-index d5636199c9f..45f8c8e8100 100644 |
338 |
--- a/runtime/sys.c |
339 |
+++ b/runtime/sys.c |
340 |
@@ -112,6 +112,8 @@ static void caml_sys_check_path(value name) |