Skip to content

Commit

Permalink
dev-lang/ocaml: fix 4.11.2 src_prepare (missing patch)
Browse files Browse the repository at this point in the history
Accidentally cleaned up in 9e83692 (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: 9e83692
See: https://forums.gentoo.org/viewtopic-t-1147490.html
Signed-off-by: Sam James <sam@gentoo.org>
  • Loading branch information
thesamesam committed Feb 27, 2022
1 parent f9dcc14 commit 687393e
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
42 changes: 42 additions & 0 deletions 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)$@ $<
2 changes: 1 addition & 1 deletion dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
Expand Up @@ -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() {
Expand Down

0 comments on commit 687393e

Please sign in to comment.