mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-22 00:35:15 +00:00
8025aa10ce
The 'force-safe-string; setting is NOT enabled, as opposed to the new upstream default. OCaml users are encouraged to migrate to safe strings as soon as possible. - The X11 library isn't part of lang/ocaml anymore, users should install x11-toolkits/ocaml-graphics. - Add new 'ocaml' USES - Bump PORTREVISION on dependent ports, due to ABI Change. The update includes the following updates to existing ports (needed to keep them working): - devel/ocaml-camlp4: Updated to 4.14+1 - devel/ocaml-camlp5: Updated to 8.02.01, homepage updated - devel/ocaml-dune: Patch to allow overriding the stublibs directory, strip binary and shared libraries - devel/ocaml-findlib: Improve port - devel/ocaml-lwt: Fix build with OCaml 4.14 - deve/ocaml-re: Update to 1.11.0, use new dune USES - devel/ocaml-sdl: Fix build with new ocaml - games/freetennis: Fix build, tidy Makefile - graphics/ocaml-images: Updated to 5.0.4, new homepage, use new dune USES, undeprecate - graphics/ocaml-lablgl: Moved into site-lib, dynamic objects stripped, add missing GL dependencies - math/coq: Updated to 8.19.0 - math/ocaml-zarith: strip shared libraries, fixed usage of USE_OCAML_LDCONFIG, use new dune USES - math/teyjus: Fix build - net/unison240: Fix build with new compiler - net/unison248: Fix build with new compiler, add MAKE_JOBS_UNSAFE - net-p2p/mldonkey: Fix build with new compiler, fix build on i386 - sysutils/ledit: Updated to 2.06, install native binary, Use github, fix man page installation - www/geneweb: Build fix for OCaml and Camlp5 updates - x11-toolkits/ocaml-lablgtk2: Fix build with new compiler - x11-toolkits/ocaml-lablgtk3: Updated to 3.1.4, added ocaml-camlp-stream dependency, build fix patch - x11-toolkits/ocaml-labltk: Updated to 8.06.12, Improve Makefile Added the following ports: - devel/ocaml-astring - devel/ocaml-base - devel/ocaml-bos - devel/ocaml-camlp-streams - devel/ocaml-csexp - devel/ocaml-fmt - devel/ocaml-fpath - devel/ocaml-logs - devel/ocaml-mtime - devel/ocaml-pcre2 - devel/ocaml-rresult - devel/ocaml-seq - devel/ocaml-stdio - x11-toolkits/ocaml-graphics PR: 250408 [1], 262781 [1], 262788 [3], 262789 [1], 262792 [1], 263006 [1], 263162 [3], 263206 [2], 276893 [1], 276945 [4], 276953 [1], 277026 [5], 277241 [1], 277242 [1], 277243 [1], 277244 [1], 277245 [1], 277246 [1], 277247 [1], 277248 [1], 277249 [1], 277250 [1], 277251 [1], 277252 [1], 277253 [1], 277254 [1], 277255 [1], 277256 [4], 277257 [1], 277258 [1] Approved by: maintainer timeout [1], yuri (maintainer) [2], overcome by events, fixit [3], madpilot (maintainer) [4] Reviewed by: madpilot Exp-run by: antoine [5] Differential Revision: https://reviews.freebsd.org/D43861
44 lines
1.3 KiB
Plaintext
44 lines
1.3 KiB
Plaintext
--- Makefile.OCaml.orig 2017-12-18 12:23:54 UTC
|
|
+++ Makefile.OCaml
|
|
@@ -32,7 +32,11 @@ ifeq ($(shell uname),NetBSD)
|
|
else
|
|
ifeq ($(shell uname),NetBSD)
|
|
OSARCH=NetBSD
|
|
+else
|
|
+ifeq ($(shell uname),FreeBSD)
|
|
+ OSARCH=FreeBSD
|
|
endif
|
|
+endif
|
|
ifeq ($(shell uname),Linux)
|
|
OSARCH=Linux
|
|
endif
|
|
@@ -240,7 +244,7 @@ OCAMLLIBS+=unix.cma str.cma bigarray.cma
|
|
# File extensions will be substituted for the native code version
|
|
OCAMLLIBS+=unix.cma str.cma bigarray.cma
|
|
|
|
-COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT)
|
|
+COBJS+=osxsupport$(OBJ_EXT) pty$(OBJ_EXT) bytearray_stubs$(OBJ_EXT) hash_compat$(OBJ_EXT)
|
|
|
|
########################################################################
|
|
### User Interface setup
|
|
@@ -311,6 +315,10 @@ endif
|
|
-include fsmonitor/linux/Makefile src/fsmonitor/linux/Makefile
|
|
endif
|
|
|
|
+ifeq ($(OSARCH),FreeBSD)
|
|
+-include fsmonitor/linux/Makefile src/fsmonitor/linux/Makefile
|
|
+endif
|
|
+
|
|
ifeq ($(OSARCH),win32gnuc)
|
|
-include fsmonitor/windows/Makefile src/fsmonitor/windows/Makefile
|
|
endif
|
|
@@ -436,7 +444,7 @@ win32rc/unison.res.lib: win32rc/unison.res
|
|
|
|
%.o %.obj: %.c
|
|
@echo "$(OCAMLOPT): $< ---> $@"
|
|
- $(CAMLC) $(CAMLFLAGS) -ccopt $(OUTPUT_SEL)$(CWD)/$@ -c $(CWD)/$<
|
|
+ $(CAMLC) $(CAMLFLAGS) -ccopt $(OUTPUT_SEL)$(CWD)/$@ -c $(CFLAGS) $(CWD)/$<
|
|
|
|
$(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
|
|
@echo Linking $@
|