From 8025aa10ceb960b62c9a826fb56eb1ac68ea1ce3 Mon Sep 17 00:00:00 2001 From: Benjamin Jacobs Date: Mon, 11 Mar 2024 22:43:46 +0100 Subject: lang/ocaml: Update to 4.14.1 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 --- lang/ocaml/files/patch-configure | 111 ++++++--------------------------------- 1 file changed, 16 insertions(+), 95 deletions(-) (limited to 'lang/ocaml/files/patch-configure') diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index c3e62de2bf07..5f1b980257d6 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -1,66 +1,23 @@ ---- configure.orig 2019-08-05 17:32:44 UTC +--- configure.orig 2022-12-20 12:26:44 UTC +++ configure -@@ -9857,7 +9857,7 @@ fi - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) -- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_cmds='$CC -shared $pic_flag -o $lib $LDFLAGS $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -13342,7 +13342,7 @@ esac ;; #( - *-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\ - |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*) : - sharedlib_cflags="-fPIC" -- mksharedlib="$CC -shared" -+ mksharedlib="$CC -shared $LDFLAGS" - oc_ldflags="$oc_ldflags -Wl,-E" - rpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," -@@ -13385,6 +13385,8 @@ fi ;; #( +@@ -14169,10 +14169,14 @@ if test x"$supports_shared_libraries" = 'xtrue'; then natdynlink=true ;; #( - powerpc*-*-linux*) : + x86_64-*-dragonfly*) : natdynlink=true ;; #( -+ powerpc*-*-freebsd*) : -+ natdynlink=true ;; #( - i686-*-kfreebsd*) : - natdynlink=true ;; #( - x86_64-*-kfreebsd*) : -@@ -13395,6 +13397,8 @@ fi ;; #( - natdynlink=true ;; #( - x86_64-*-freebsd*) : +- i[3456]86-*-freebsd*) : ++ aarch64-*-freebsd*) : natdynlink=true ;; #( +- x86_64-*-freebsd*) : + amd64-*-freebsd*) : + natdynlink=true ;; #( ++ armv7-*-freebsd*) : ++ natdynlink=true ;; #( ++ i[3456]86-*-freebsd*) : + natdynlink=true ;; #( i[3456]86-*-openbsd*) : natdynlink=true ;; #( x86_64-*-openbsd*) : -@@ -13415,6 +13419,8 @@ fi ;; #( - natdynlink=true ;; #( - aarch64-*-linux*) : - natdynlink=true ;; #( -+ aarch64-*-freebsd*) : -+ natdynlink=true ;; #( - *) : - ;; - esac -@@ -13488,6 +13494,14 @@ fi; system=elf ;; #( - else - model=ppc - fi; system=elf ;; #( -+ powerpc64le*-*-freebsd*) : -+ arch=power; model=ppc64le; system=freebsd;; #( -+ powerpc*-*-freebsd*) : -+ arch=power; if $arch64; then : -+ model=ppc64 -+else -+ model=ppc -+fi; system=freebsd ;; #( - powerpc-*-netbsd*) : - arch=power; model=ppc; system=netbsd ;; #( - powerpc-*-openbsd*) : -@@ -13510,6 +13524,8 @@ fi; system=elf ;; #( +@@ -14338,6 +14342,8 @@ fi; system=elf ;; #( arch=arm; model=armv6; system=linux_eabi ;; #( armv6*-*-freebsd*) : arch=arm; model=armv6; system=freebsd ;; #( @@ -69,48 +26,12 @@ earmv6*-*-netbsd*) : arch=arm; model=armv6; system=netbsd ;; #( earmv7*-*-netbsd*) : -@@ -13534,6 +13550,8 @@ fi; system=elf ;; #( +@@ -14362,7 +14368,7 @@ fi; system=elf ;; #( arch=amd64; system=dragonfly ;; #( - x86_64-*-freebsd*) : - arch=amd64; system=freebsd ;; #( + x86_64-*-solaris*) : + arch=amd64; system=solaris ;; #( +- x86_64-*-freebsd*) : + amd64-*-freebsd*) : -+ arch=amd64; system=freebsd ;; #( + arch=amd64; system=freebsd ;; #( x86_64-*-netbsd*) : arch=amd64; system=netbsd ;; #( - x86_64-*-openbsd*) : -@@ -13544,6 +13562,8 @@ fi; system=elf ;; #( - arch=amd64; system=mingw64 ;; #( - aarch64-*-linux*) : - arch=arm64; system=linux ;; #( -+ aarch64-*-freebsd*) : -+ arch=arm64; system=freebsd ;; #( - x86_64-*-cygwin*) : - arch=amd64; system=cygwin - ;; #( -@@ -13714,6 +13734,8 @@ case "$arch,$system" in #( - profiling=true ;; #( - amd64,openbsd) : - profiling=true ;; #( -+ amd64,dragonfly) : -+ profiling=true ;; #( - amd64,freebsd) : - profiling=true ;; #( - amd64,netbsd) : -@@ -13722,11 +13744,17 @@ case "$arch,$system" in #( - profiling=true ;; #( - amd64,gnu) : - profiling=true ;; #( -+ arm64,freebsd) : -+ profiling=true ;; #( -+ arm,freebsd) : -+ profiling=true ;; #( - arm,linux*) : - profiling=true ;; #( - power,elf) : - profiling=true ;; #( - power,bsd*) : -+ profiling=true ;; #( -+ power,freebsd) : - profiling=true ;; #( - power,netbsd) : - profiling=true ;; #( -- cgit v1.2.3