| 1 |
commit: 687393e4bd5f9a0f9bf4a2f766ea1246f7b324f7 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 27 06:25:12 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 27 06:26:48 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687393e4 |
| 7 |
|
| 8 |
dev-lang/ocaml: fix 4.11.2 src_prepare (missing patch) |
| 9 |
|
| 10 |
Accidentally cleaned up in 9e8369277b272b15f3dd1159fa18b71ec4431a77 (got |
| 11 |
confused by what I had/hadn't moved into patch tarballs, renamed accordingly |
| 12 |
now to avoid that in future). |
| 13 |
|
| 14 |
Once OCaml 4.09.0-r3 stabilisation is complete, we can cleanup all |
| 15 |
the obsolete patches from files/ and then everything is a bit clearer. |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/804498 |
| 18 |
Fixes: 9e8369277b272b15f3dd1159fa18b71ec4431a77 |
| 19 |
See: https://forums.gentoo.org/viewtopic-t-1147490.html |
| 20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 21 |
|
| 22 |
dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch | 42 ++++++++++++++++++++++++++ |
| 23 |
dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +- |
| 24 |
2 files changed, 43 insertions(+), 1 deletion(-) |
| 25 |
|
| 26 |
diff --git a/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch b/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch |
| 27 |
new file mode 100644 |
| 28 |
index 000000000000..7adb1ea0768d |
| 29 |
--- /dev/null |
| 30 |
+++ b/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch |
| 31 |
@@ -0,0 +1,42 @@ |
| 32 |
+--- a/runtime/Makefile |
| 33 |
++++ b/runtime/Makefile |
| 34 |
+@@ -335,7 +335,7 @@ |
| 35 |
+ # (without the extension, which is added by the macro) |
| 36 |
+ define COMPILE_C_FILE |
| 37 |
+ $(1).$(O): %.c |
| 38 |
+- $$(CC) -c $$(OC_CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$< |
| 39 |
++ $$(CC) -c $$(OC_CFLAGS) $(CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$< |
| 40 |
+ endef |
| 41 |
+ |
| 42 |
+ object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic |
| 43 |
+--- a/otherlibs/Makefile.otherlibs.common |
| 44 |
++++ b/otherlibs/Makefile.otherlibs.common |
| 45 |
+@@ -138,4 +138,4 @@ |
| 46 |
+ $(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $< |
| 47 |
+ |
| 48 |
+ .c.$(O): |
| 49 |
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
| 50 |
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
| 51 |
+--- a/otherlibs/systhreads/Makefile |
| 52 |
++++ b/otherlibs/systhreads/Makefile |
| 53 |
+@@ -102,10 +102,10 @@ |
| 54 |
+ st_stubs_n.$(O): OC_CPPFLAGS += $(NATIVE_CPPFLAGS) |
| 55 |
+ |
| 56 |
+ st_stubs_b.$(O): st_stubs.c $(HEADER) |
| 57 |
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
| 58 |
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
| 59 |
+ |
| 60 |
+ st_stubs_n.$(O): st_stubs.c $(HEADER) |
| 61 |
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
| 62 |
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
| 63 |
+ |
| 64 |
+ partialclean: |
| 65 |
+ rm -f *.cm* |
| 66 |
+--- a/Makefile.common.in |
| 67 |
++++ b/Makefile.common.in |
| 68 |
+@@ -79,4 +79,4 @@ |
| 69 |
+ # general (it supports both .o and .obj) |
| 70 |
+ |
| 71 |
+ %.$(O): %.c |
| 72 |
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
| 73 |
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< |
| 74 |
|
| 75 |
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild |
| 76 |
index 666f43b938bd..00f3ebf026fd 100644 |
| 77 |
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild |
| 78 |
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild |
| 79 |
@@ -25,7 +25,7 @@ QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs' |
| 80 |
|
| 81 |
PATCHES=( |
| 82 |
"${FILESDIR}"/${PN}-4.11.2-glibc-2.34.patch |
| 83 |
- "${FILESDIR}"/${PN}-4.10.2-cflags.patch |
| 84 |
+ "${FILESDIR}"/${PN}-4.11.2-cflags.patch |
| 85 |
) |
| 86 |
|
| 87 |
src_prepare() { |
Archives