commit: 687393e4bd5f9a0f9bf4a2f766ea1246f7b324f7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Feb 27 06:25:12 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 27 06:26:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687393e4
dev-lang/ocaml: fix 4.11.2 src_prepare (missing patch) Accidentally cleaned up in 9e8369277b272b15f3dd1159fa18b71ec4431a77 (got confused by what I had/hadn't moved into patch tarballs, renamed accordingly now to avoid that in future). Once OCaml 4.09.0-r3 stabilisation is complete, we can cleanup all the obsolete patches from files/ and then everything is a bit clearer. Bug: https://bugs.gentoo.org/804498 Fixes: 9e8369277b272b15f3dd1159fa18b71ec4431a77 See: https://forums.gentoo.org/viewtopic-t-1147490.html Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch | 42 ++++++++++++++++++++++++++ dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch b/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch new file mode 100644 index 000000000000..7adb1ea0768d --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch @@ -0,0 +1,42 @@ +--- a/runtime/Makefile ++++ b/runtime/Makefile +@@ -335,7 +335,7 @@ + # (without the extension, which is added by the macro) + define COMPILE_C_FILE + $(1).$(O): %.c +- $$(CC) -c $$(OC_CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$< ++ $$(CC) -c $$(OC_CFLAGS) $(CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$< + endef + + object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic +--- a/otherlibs/Makefile.otherlibs.common ++++ b/otherlibs/Makefile.otherlibs.common +@@ -138,4 +138,4 @@ + $(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $< + + .c.$(O): +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< ++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< +--- a/otherlibs/systhreads/Makefile ++++ b/otherlibs/systhreads/Makefile +@@ -102,10 +102,10 @@ + st_stubs_n.$(O): OC_CPPFLAGS += $(NATIVE_CPPFLAGS) + + st_stubs_b.$(O): st_stubs.c $(HEADER) +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< ++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< + + st_stubs_n.$(O): st_stubs.c $(HEADER) +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< ++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< + + partialclean: + rm -f *.cm* +--- a/Makefile.common.in ++++ b/Makefile.common.in +@@ -79,4 +79,4 @@ + # general (it supports both .o and .obj) + + %.$(O): %.c +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< ++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild index 666f43b938bd..00f3ebf026fd 100644 --- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild +++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild @@ -25,7 +25,7 @@ QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs' PATCHES=( "${FILESDIR}"/${PN}-4.11.2-glibc-2.34.patch - "${FILESDIR}"/${PN}-4.10.2-cflags.patch + "${FILESDIR}"/${PN}-4.11.2-cflags.patch ) src_prepare() {
