diff options
Diffstat (limited to 'dev-lang/ocaml/files')
-rw-r--r-- | dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch | 65 | ||||
-rw-r--r-- | dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch | 42 |
2 files changed, 107 insertions, 0 deletions
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch new file mode 100644 index 000000000000..8d2391407a35 --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch @@ -0,0 +1,65 @@ +--- a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100 ++++ b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100 +@@ -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/yacc/Makefile 2022-01-22 20:02:56.510340885 +0100 ++++ b/yacc/Makefile 2022-01-22 20:03:14.998000508 +0100 +@@ -63,4 +63,4 @@ + # also works for .obj files. + + %.$(O): %.c +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< ++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< +--- a/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:15.316779625 +0100 ++++ b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701 +0100 +@@ -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/ocamltest/Makefile 2022-01-22 20:30:22.454009704 +0100 ++++ b/ocamltest/Makefile 2022-01-22 20:30:33.845799603 +0100 +@@ -221,7 +221,7 @@ + $(ocamllex) -q $< + + %.$(O): %.c +- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) -c $< ++ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -c $< + + ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config + sed \ +--- a/otherlibs/systhreads/Makefile 2022-01-22 20:42:17.647349876 +0100 ++++ b/otherlibs/systhreads/Makefile 2022-01-22 20:43:29.766086103 +0100 +@@ -93,11 +93,11 @@ + # twice, each time with different options). + + st_stubs_b.$(O): st_stubs.c $(HEADER) +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime \ ++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime \ + $(SHAREDLIB_CFLAGS) $(OUTPUTOBJ)$@ $< + + st_stubs_n.$(O): st_stubs.c $(HEADER) +- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) \ ++ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) \ + -I$(ROOTDIR)/runtime $(SHAREDLIB_CFLAGS) -DNATIVE_CODE \ + -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \ + $(OUTPUTOBJ)$@ -c $< +--- a/tools/Makefile 2022-01-23 09:57:00.788877931 +0100 ++++ b/tools/Makefile 2022-01-23 09:57:21.735516656 +0100 +@@ -322,7 +322,7 @@ + endif + + objinfo_helper$(EXE): objinfo_helper.c $(ROOTDIR)/runtime/caml/s.h +- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime $(OUTPUTEXE)$@ \ ++ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime $(OUTPUTEXE)$@ \ + $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) $< $(LIBBFD_LINK) + + OBJINFO=$(ROOTDIR)/compilerlibs/ocamlcommon.cma \ diff --git a/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch new file mode 100644 index 000000000000..01117c39887d --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch @@ -0,0 +1,42 @@ +--- a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100 ++++ b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100 +@@ -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 2022-01-22 20:24:15.316779625 +0100 ++++ b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701 +0100 +@@ -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 2022-01-22 20:42:17.647349876 +0100 ++++ b/otherlibs/systhreads/Makefile 2022-01-22 20:43:29.766086103 +0100 +@@ -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 2022-01-23 18:05:04.192323554 +0100 ++++ b/Makefile.common.in 2022-01-23 18:05:17.211122643 +0100 +@@ -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)$@ $< |