<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2768b711935f0277401ffe9355dbf9ebdea29611">https://github.com/macports/macports-ports/commit/2768b711935f0277401ffe9355dbf9ebdea29611</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2768b711935 ocaml: update to 4.14
</span>2768b711935 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2768b711935f0277401ffe9355dbf9ebdea29611
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Nov 21 08:40:47 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> ocaml: update to 4.14
</span>---
lang/ocaml/Portfile | 10 +++----
lang/ocaml/files/patch-configure-darwin-ppc.diff | 38 ++++++++++++------------
lang/ocaml/files/patch-configure-darwin32.diff | 16 +++++-----
3 files changed, 32 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ocaml/Portfile b/lang/ocaml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aadb432bcd5..80c0a673b4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ocaml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ocaml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +13,8 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name ocaml
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.12.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.14.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set major_vers [join [lrange [split ${version} .] 0 1] .]
platforms darwin
# Note that ppc, ppc64 and i386 on Mac are no longer supported by upstream
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ license LGPL
</span> homepage https://ocaml.org
master_sites http://caml.inria.fr/pub/distrib/ocaml-${major_vers}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eeb6b6afce7e5f07052e5f77659fca4cb22fce91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6e4aab9e182c1587c3439adff0b32c9ffc658a8808851e90d7d51b8cab9572c9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3581960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cc9581893f668662243479e06665ffc695737f14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 36abd8cca53ff593d5e7cd8b98eee2f1f36bd49aaf6ff26dc4c4dd21d861ac2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3800304
</span>
description Compiler and libraries for the OCaml programming language
long_description OCaml is an industrial strength programming language \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ocaml/files/patch-configure-darwin-ppc.diff b/lang/ocaml/files/patch-configure-darwin-ppc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 091616b3c52..513e7a6f5db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ocaml/files/patch-configure-darwin-ppc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ocaml/files/patch-configure-darwin-ppc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2021-09-24 21:06:54.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2022-05-23 22:55:50.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13732,6 +13732,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-03-28 21:51:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-11-18 16:09:16.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14169,6 +14169,8 @@
</span> natdynlink=true ;; #(
x86_64-*-darwin*) :
natdynlink=true ;; #(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> s390x*-*-linux*) :
natdynlink=true ;; #(
powerpc*-*-linux*) :
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13937,6 +13939,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14388,6 +14390,12 @@
</span> arch=arm64; system=macosx ;; #(
x86_64-*-darwin*) :
arch=amd64; system=macosx ;; #(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,22 +22,22 @@
</span> x86_64-*-mingw32) :
arch=amd64; system=mingw64 ;; #(
aarch64-*-linux*) :
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14071,6 +14079,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$arch,$CC,$system,$model" in #(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- amd64,gcc*,macosx,*) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14524,6 +14532,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$arch,$cc_basename,$system,$model" in #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ amd64,*gcc*,macosx,*) :
</span> PACKLD_FLAGS=' -arch x86_64' ;; #(
+ power,*gcc*,rhapsody,ppc) :
+ PACKLD_FLAGS=' -arch ppc' ;; #(
+ power,*gcc*,rhapsody,ppc64) :
+ PACKLD_FLAGS=' -arch ppc64' ;; #(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- power,gcc*,elf,ppc) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ power,*gcc*,elf,ppc) :
</span> PACKLD_FLAGS=' -m elf32ppclinux' ;; #(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- power,gcc*,elf,ppc64) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14241,6 +14253,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_as="${toolpref}as -arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_aspp="${toolpref}gcc -arch x86_64 -c" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac ;; #(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ power,rhapsody) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ power,*gcc*,elf,ppc64) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14622,6 +14634,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin*,clang-*) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_as="$default_as -Wno-trigraphs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_aspp="$default_as" ;; #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ powerpc*-*-darwin*,gcc-*) :
</span> + case $model in #(
+ ppc64) :
+ default_as="$default_as -m64"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,15 +46,15 @@
</span> + default_as="$default_as"
+ default_aspp="$default_as -m32 -c" ;; #(
+esac ;; #(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- amd64,solaris) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $ocaml_cv_cc_vendor in #(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sunc-*) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15923,7 +15944,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16654,7 +16675,7 @@
</span> $as_echo_n "checking whether stack overflows can be detected... " >&6; }
case $arch,$system in #(
- i386,linux_elf|amd64,linux|amd64,macosx \
+ i386,linux_elf|amd64,linux|amd64,macosx|power,rhapsody \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- |amd64,openbsd|i386,bsd_elf) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ |amd64,openbsd|i386,bsd_elf|arm64,linux|arm64,macosx) :
</span> $as_echo "#define HAS_STACK_OVERFLOW_DETECTION 1" >>confdefs.h
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ocaml/files/patch-configure-darwin32.diff b/lang/ocaml/files/patch-configure-darwin32.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 372760a074a..2e185c700a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ocaml/files/patch-configure-darwin32.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ocaml/files/patch-configure-darwin32.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-12-16 13:52:33.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-12-16 13:57:05.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13317,7 +13317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-03-28 21:51:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-11-18 15:56:19.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14087,7 +14087,7 @@
</span> case $host in #(
*-apple-darwin*) :
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mksharedlib="$CC -shared -flat_namespace -undefined suppress \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -Wl,-no_compact_unwind"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -Wl,-no_compact_unwind -read_only_relocs suppress"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shared_libraries_supported=true ;; #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mksharedlib="$CC -shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -flat_namespace -undefined suppress -Wl,-no_compact_unwind \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -flat_namespace -undefined suppress -Wl,-no_compact_unwind -read_only_relocs suppress \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \$(LDFLAGS)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supports_shared_libraries=true ;; #(
</span> *-*-mingw32) :
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mksharedlib='$(FLEXLINK)'
</span></pre><pre style='margin:0'>
</pre>