From 4fe700e9f334a6c8f68d2394c2e184efced29be8 Mon Sep 17 00:00:00 2001 From: Jaap Boender Date: Wed, 15 Jan 2020 15:29:05 +0000 Subject: [PATCH] Updated ocaml to version 4.10.0beta1. --- ocaml/Makefile.common | 5 ++- ocaml/PLIST | 37 +++++++++++++++++++ ocaml/distinfo | 24 ++++++------ ocaml/patches/patch-Makefile | 14 +++---- ocaml/patches/patch-Makefile.common.in | 6 +-- ocaml/patches/patch-lex_Makefile | 4 +- ocaml/patches/patch-ocamldoc_Makefile | 8 ++-- .../patch-otherlibs_Makefile.otherlibs.common | 15 ++++---- .../patch-otherlibs_systhreads_Makefile | 18 ++++----- ocaml/patches/patch-tools_Makefile | 6 +-- ocaml/patches/patch-yacc_Makefile | 10 ++--- 11 files changed, 93 insertions(+), 54 deletions(-) diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common index c474a2e4b31..efd36d080eb 100644 --- a/ocaml/Makefile.common +++ b/ocaml/Makefile.common @@ -1,9 +1,10 @@ # $NetBSD: Makefile.common,v 1.55 2018/11/12 16:09:34 jaapb Exp $ # used by x11/labltk/Makefile -DISTNAME= ocaml-4.09.0 +DISTNAME= ocaml-4.10.0+beta1 +PKGNAME= ocaml-4.10.0beta1 CATEGORIES= lang -MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.09/ +MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.10/ #EXTRACT_SUFX= .tar.bz2 MAINTAINER= jaapb@NetBSD.org diff --git a/ocaml/PLIST b/ocaml/PLIST index 6d47a50638f..c43830065b1 100644 --- a/ocaml/PLIST +++ b/ocaml/PLIST @@ -79,6 +79,9 @@ lib/ocaml/caml/compatibility.h lib/ocaml/caml/config.h lib/ocaml/caml/custom.h lib/ocaml/caml/debugger.h +lib/ocaml/caml/domain.h +lib/ocaml/caml/domain_state.h +lib/ocaml/caml/domain_state.tbl lib/ocaml/caml/dynlink.h lib/ocaml/caml/exec.h lib/ocaml/caml/fail.h @@ -103,6 +106,7 @@ lib/ocaml/caml/m.h lib/ocaml/caml/major_gc.h lib/ocaml/caml/md5.h lib/ocaml/caml/memory.h +lib/ocaml/caml/memprof.h lib/ocaml/caml/minor_gc.h lib/ocaml/caml/misc.h lib/ocaml/caml/mlvalues.h @@ -376,6 +380,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmt ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmti ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmx ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.mli +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmi +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmt +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmti +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmx +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.mli ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmi ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmt ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmti @@ -396,6 +405,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmt ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmti ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmx ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.mli +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmi +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmt +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmti +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmx +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.mli ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmi ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmt ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmti @@ -538,6 +552,11 @@ lib/ocaml/compiler-libs/docstrings.cmt lib/ocaml/compiler-libs/docstrings.cmti ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/docstrings.cmx lib/ocaml/compiler-libs/docstrings.mli +lib/ocaml/compiler-libs/domainstate.cmi +lib/ocaml/compiler-libs/domainstate.cmt +lib/ocaml/compiler-libs/domainstate.cmti +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/domainstate.cmx +lib/ocaml/compiler-libs/domainstate.mli ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmi ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmt ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmti @@ -777,6 +796,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmi +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmt +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmti +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmx +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.mli ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmi ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmt ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmti @@ -870,6 +894,9 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlbytecomp.cmxa ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.a lib/ocaml/compiler-libs/ocamlcommon.cma ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.cmxa +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.a +lib/ocaml/compiler-libs/ocamlmiddleend.cma +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.cmxa ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.a ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cma ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cmxa @@ -1302,6 +1329,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmt ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli +lib/ocaml/compiler-libs/type_immediacy.cmi +lib/ocaml/compiler-libs/type_immediacy.cmt +lib/ocaml/compiler-libs/type_immediacy.cmti +${PLIST.ocaml-opt}lib/ocaml/compiler-libs/type_immediacy.cmx +lib/ocaml/compiler-libs/type_immediacy.mli lib/ocaml/compiler-libs/typeclass.cmi lib/ocaml/compiler-libs/typeclass.cmt lib/ocaml/compiler-libs/typeclass.cmti @@ -2180,6 +2212,7 @@ man/man3/Depend.String.3 man/man3/Digest.3 man/man3/Docstrings.3 man/man3/Docstrings.WithMenhir.3 +man/man3/Domainstate.3 man/man3/Dynlink.3 man/man3/Ephemeron.3 man/man3/Ephemeron.GenHashTable.3 @@ -2388,6 +2421,10 @@ man/man3/Strongly_connected_components.S.3 man/man3/Strongly_connected_components.S.Id.3 man/man3/Syntaxerr.3 man/man3/Sys.3 +man/man3/Sys.Immediate64.3 +man/man3/Sys.Immediate64.Immediate.3 +man/man3/Sys.Immediate64.Make.3 +man/man3/Sys.Immediate64.Non_immediate.3 man/man3/Targetint.3 man/man3/Terminfo.3 man/man3/Thread.3 diff --git a/ocaml/distinfo b/ocaml/distinfo index 480de839c9e..ff6eb37785c 100644 --- a/ocaml/distinfo +++ b/ocaml/distinfo @@ -1,21 +1,21 @@ $NetBSD: distinfo,v 1.125 2019/01/07 18:52:23 jaapb Exp $ -SHA1 (ocaml-4.09.0.tar.gz) = 981f15617d90ed990919c031c8c1f39b45f62002 -RMD160 (ocaml-4.09.0.tar.gz) = a6c7b137ada913531092e111dabccd8c4248313d -SHA512 (ocaml-4.09.0.tar.gz) = c1b666839960c157868fc32a96fe4137280a4b99464ba2c6616700b962d802ed86467ec21c341abbefdf684b8314b90fd6a5018c6de58dc29152af851eebea88 -Size (ocaml-4.09.0.tar.gz) = 4829882 bytes -SHA1 (patch-Makefile) = 132a1cf1187dc05ec5338b496757d89047e91130 -SHA1 (patch-Makefile.common.in) = fbf3dc0614073ed5ac9b220211a837f69a4ffcaf +SHA1 (ocaml-4.10.0+beta1.tar.gz) = 06fd8f4214e7b5de22b9193b92b068944426b286 +RMD160 (ocaml-4.10.0+beta1.tar.gz) = f2c36fd178ad1979ecce85db5fd578cdef74046c +SHA512 (ocaml-4.10.0+beta1.tar.gz) = b3dbe539a83cd45624b247de5c72a4f114a8959a0f36785f3d4b5c1a63d9d0b72223241c720bd720830cfa1b758fcebe4ccd79e1fa7141f05629c669537e1ccf +Size (ocaml-4.10.0+beta1.tar.gz) = 4921837 bytes +SHA1 (patch-Makefile) = 50103df7b34f110a1d7f2b9c2d7f47c9885e8b52 +SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827 SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b SHA1 (patch-asmrun_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e SHA1 (patch-configure) = 311b18383bcc88f2a67d83d4b0c6e35344bd2d0d -SHA1 (patch-lex_Makefile) = 18d1b8272ffb3e3a58c26d8a2494aaae6942426a +SHA1 (patch-lex_Makefile) = 7f1ad4d5852a9a38b9c33ca33728236cc457fa09 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22 -SHA1 (patch-ocamldoc_Makefile) = ca4997636f7a6a382bbcb7be365526e94be4534a +SHA1 (patch-ocamldoc_Makefile) = 0a3c536d1cd9f811a1ef1d7155036b8ddbcf4f4f SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b -SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 98211e0a220d360560c2b3f8d7e1fad4c83f2726 -SHA1 (patch-otherlibs_systhreads_Makefile) = a713371cf16e79ee3e5d0f9f8d128476d4c9bee9 +SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 05f14ad2635bfd2ded98ef38ac6e7578b5cfc08e +SHA1 (patch-otherlibs_systhreads_Makefile) = ff2cf90527bda37474097bb576bccbf7329c4f1d SHA1 (patch-runtime_Makefile) = 6c70b68791e4c074179aa27dfafb398646b59dcb -SHA1 (patch-tools_Makefile) = 871d40893d0300d80b9322631321803348a154cf +SHA1 (patch-tools_Makefile) = 69f92a8615ed6f9b33f27546c6a25a1f24995e55 SHA1 (patch-tools_ocamlmklib) = 9a9c0e3b473f7ba4127fe120cf6dbbdbb3c957f2 -SHA1 (patch-yacc_Makefile) = c416081421f5e09273ea8b04062402cbfeba7497 +SHA1 (patch-yacc_Makefile) = 3d8962a2d447aa7e88e59151d66e2080f7fad1fb diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile index 32ad7272c8c..70c8d52d943 100644 --- a/ocaml/patches/patch-Makefile +++ b/ocaml/patches/patch-Makefile @@ -3,18 +3,18 @@ $NetBSD$ Use BSD_INSTALL_* instead of mkdir Honor LDFLAGS ---- Makefile.orig 2019-04-18 10:10:54.000000000 +0000 +--- Makefile.orig 2020-01-10 16:10:46.000000000 +0000 +++ Makefile -@@ -54,7 +54,7 @@ INCLUDES=-I utils -I parsing -I typing - - COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \ - -warn-error A \ - -bin-annot -safe-string -strict-formats $(INCLUDES) +@@ -53,7 +53,7 @@ OPTCOMPFLAGS= -function-sections + else + OPTCOMPFLAGS= + endif -LINKFLAGS= +LINKFLAGS= -cclib "$(LDFLAGS)" ifeq "$(strip $(NATDYNLINKOPTS))" "" OCAML_NATDYNLINKOPTS= -@@ -513,10 +513,10 @@ endif +@@ -545,10 +545,10 @@ endif # Installation .PHONY: install install: @@ -29,7 +29,7 @@ Honor LDFLAGS $(INSTALL_DATA) \ VERSION \ "$(INSTALL_LIBDIR)" -@@ -564,7 +564,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true +@@ -602,7 +602,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true endif $(MAKE) -C tools install ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix diff --git a/ocaml/patches/patch-Makefile.common.in b/ocaml/patches/patch-Makefile.common.in index 36419736a0d..7668c523665 100644 --- a/ocaml/patches/patch-Makefile.common.in +++ b/ocaml/patches/patch-Makefile.common.in @@ -2,10 +2,10 @@ $NetBSD$ Use BSD_INSTALL_* ---- Makefile.common.in.orig 2019-03-01 15:13:45.000000000 +0000 +--- Makefile.common.in.orig 2020-01-10 16:10:46.000000000 +0000 +++ Makefile.common.in -@@ -16,9 +16,9 @@ - # This makefile contains common definitions shared by other Makefiles +@@ -19,9 +19,9 @@ + # other Makefiles # We assume that Makefile.config has already been included -INSTALL ?= @INSTALL@ diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile index f5e740a80de..7774cdc622d 100644 --- a/ocaml/patches/patch-lex_Makefile +++ b/ocaml/patches/patch-lex_Makefile @@ -2,11 +2,11 @@ $NetBSD$ Honor LDFLAGS. ---- lex/Makefile.orig 2019-09-11 14:40:30.000000000 +0000 +--- lex/Makefile.orig 2020-01-10 16:10:46.000000000 +0000 +++ lex/Makefile @@ -27,7 +27,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib - COMPFLAGS = $(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \ + COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -warn-error A \ -safe-string -strict-sequence -strict-formats -bin-annot -LINKFLAGS = +LINKFLAGS = -cclib "$(LDFLAGS)" diff --git a/ocaml/patches/patch-ocamldoc_Makefile b/ocaml/patches/patch-ocamldoc_Makefile index 93ab4d9efb6..6d6d1cd7fd7 100644 --- a/ocaml/patches/patch-ocamldoc_Makefile +++ b/ocaml/patches/patch-ocamldoc_Makefile @@ -2,12 +2,12 @@ $NetBSD$ Honor LDFLAGS. ---- ocamldoc/Makefile.orig 2019-03-01 15:13:46.000000000 +0000 +--- ocamldoc/Makefile.orig 2020-01-10 16:10:46.000000000 +0000 +++ ocamldoc/Makefile -@@ -104,7 +104,7 @@ DEPINCLUDES=$(INCLUDES_DEP) - INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODEP) +@@ -121,7 +121,7 @@ INCLUDES=$(INCLUDES_DEP) $(INCLUDES_NODE + COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \ + -safe-string -strict-sequence -strict-formats -bin-annot -principal - COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A -safe-string -strict-sequence -strict-formats -bin-annot -LINKFLAGS=$(INCLUDES) -nostdlib +LINKFLAGS=$(INCLUDES) -nostdlib -cclib "$(LDFLAGS)" diff --git a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common index 174d142b440..f1912f4bb4c 100644 --- a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common +++ b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common @@ -2,13 +2,14 @@ $NetBSD$ Honor LDFLAGS. ---- otherlibs/Makefile.otherlibs.common.orig 2019-02-08 14:34:10.000000000 +0000 +--- otherlibs/Makefile.otherlibs.common.orig 2020-01-10 16:10:46.000000000 +0000 +++ otherlibs/Makefile.otherlibs.common -@@ -48,6 +48,7 @@ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlm - #LINKOPTS= - #LDOPTS= - #HEADERS= -+LDOPTS= -ldopt "$(LDFLAGS)" - +@@ -51,7 +51,7 @@ COBJS ?= + EXTRACFLAGS ?= + EXTRACAMLFLAGS ?= + LINKOPTS ?= +-LDOPTS ?= ++LDOPTS ?= -ldopt "$(LDFLAGS)" + HEADERS ?= CMIFILES ?= $(CAMLOBJS:.cmo=.cmi) CAMLOBJS_NAT ?= $(CAMLOBJS:.cmo=.cmx) diff --git a/ocaml/patches/patch-otherlibs_systhreads_Makefile b/ocaml/patches/patch-otherlibs_systhreads_Makefile index f58bbc865ad..9c5722ee9d6 100644 --- a/ocaml/patches/patch-otherlibs_systhreads_Makefile +++ b/ocaml/patches/patch-otherlibs_systhreads_Makefile @@ -1,18 +1,18 @@ $NetBSD$ -Honor LFLAGS. +Honor LDFLAGS. ---- otherlibs/systhreads/Makefile.orig 2019-03-01 15:13:46.000000000 +0000 +--- otherlibs/systhreads/Makefile.orig 2020-01-10 16:10:46.000000000 +0000 +++ otherlibs/systhreads/Makefile -@@ -21,6 +21,7 @@ include $(ROOTDIR)/Makefile.common +@@ -29,6 +29,7 @@ NATIVE_CPPFLAGS = \ CAMLRUN ?= $(ROOTDIR)/boot/ocamlrun LIBS = -nostdlib -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/$(UNIXLIB) -+LDOPTS= -ldopt "$(LDFLAGS)" ++LDOPTS = -ldopt "$(LDFLAGS)" - CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc $(LIBS) - CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt $(LIBS) -@@ -61,7 +62,7 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $ + CAMLC=$(BEST_OCAMLC) $(LIBS) + CAMLOPT=$(BEST_OCAMLOPT) $(LIBS) +@@ -70,7 +71,7 @@ all: lib$(LIBNAME).$(A) $(LIBNAME).cma $ allopt: lib$(LIBNAME)nat.$(A) $(LIBNAME).cmxa $(CMIFILES) lib$(LIBNAME).$(A): $(BYTECODE_C_OBJS) @@ -21,7 +21,7 @@ Honor LFLAGS. lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OBJS) $(MKLIB_CMD) -o $(LIBNAME)nat $^ -@@ -69,7 +70,7 @@ lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OB +@@ -78,7 +79,7 @@ lib$(LIBNAME)nat.$(A): $(NATIVECODE_C_OB $(LIBNAME).cma: $(THREADS_BCOBJS) ifeq "$(UNIX_OR_WIN32)" "unix" $(MKLIB) -o $(LIBNAME) -ocamlc '$(CAMLC)' -cclib -lunix -linkall \ @@ -30,7 +30,7 @@ Honor LFLAGS. # TODO: Figure out why -cclib -lunix is used here. # It may be because of the threadsUnix module which is deprecated. # It may hence be good to figure out whether this module shouldn't be -@@ -117,7 +118,7 @@ install: +@@ -124,7 +125,7 @@ install: fi $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)" cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A) diff --git a/ocaml/patches/patch-tools_Makefile b/ocaml/patches/patch-tools_Makefile index 1a4f6c381fa..5b3c8700aa7 100644 --- a/ocaml/patches/patch-tools_Makefile +++ b/ocaml/patches/patch-tools_Makefile @@ -2,14 +2,14 @@ $NetBSD$ Honor LDFLAGS. ---- tools/Makefile.orig 2019-09-11 14:40:30.000000000 +0000 +--- tools/Makefile.orig 2020-01-10 16:10:46.000000000 +0000 +++ tools/Makefile @@ -82,7 +82,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut file_formats lambda) COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -strict-sequence -warn-error A \ - -safe-string -strict-formats -bin-annot $(INCLUDES) + -principal -safe-string -strict-formats -bin-annot $(INCLUDES) -LINKFLAGS = $(INCLUDES) +LINKFLAGS = $(INCLUDES) -cclib "$(LDFLAGS)" VPATH := $(filter-out -I,$(INCLUDES)) - # scrapelabels addlabels + .PHONY: all allopt opt.opt # allopt and opt.opt are synonyms diff --git a/ocaml/patches/patch-yacc_Makefile b/ocaml/patches/patch-yacc_Makefile index b8d8da5f010..7cd0f908a77 100644 --- a/ocaml/patches/patch-yacc_Makefile +++ b/ocaml/patches/patch-yacc_Makefile @@ -2,14 +2,14 @@ $NetBSD$ Honor LDFLAGS when building ocamlyacc. ---- yacc/Makefile.orig 2019-03-01 15:13:46.000000000 +0000 +--- yacc/Makefile.orig 2020-01-10 16:10:46.000000000 +0000 +++ yacc/Makefile -@@ -36,7 +36,7 @@ MKEXE_ANSI=$(MKEXE) - endif +@@ -39,7 +39,7 @@ generated_files := ocamlyacc$(EXE) $(oca + all: ocamlyacc$(EXE) ocamlyacc$(EXE): $(ocamlyacc_OBJECTS) -- $(MKEXE_ANSI) -o $@ $^ $(EXTRALIBS) -+ $(MKEXE_ANSI) $(BYTECCLIBS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) +- $(MKEXE) -o $@ $^ $(EXTRALIBS) ++ $(MKEXE) $(BYTECCLIBS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) version.h : $(ROOTDIR)/VERSION echo "#define OCAML_VERSION \"`sed -e 1q $< | tr -d '\r'`\"" > $@