<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/35bf6cc9a92c3c3de541d1cf1930c1abd92d9842">https://github.com/macports/macports-ports/commit/35bf6cc9a92c3c3de541d1cf1930c1abd92d9842</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 35bf6cc9a92 omake: apply upstream patch to fix build
</span>35bf6cc9a92 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 35bf6cc9a92c3c3de541d1cf1930c1abd92d9842
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Mar 15 15:13:02 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> omake: apply upstream patch to fix build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/ocaml-omake/omake/commit/f523799b609ebbda1b03df55028f2d98bfcffc52
</span>---
devel/omake/Portfile | 3 ++-
devel/omake/files/patch-OCaml.om.diff | 23 +++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/omake/Portfile b/devel/omake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8000001058a..165efd9d818 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/omake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/omake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,8 @@ checksums rmd160 fc83dffbeb0e164ec8ed2e117514a2f16698676c \
</span> sha256 ff3107e9459615ea6526309c533b04815eef60692a20dcd3a6169f5860786d1d \
size 2438877
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cflags.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cflags.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-OCaml.om.diff
</span>
depends_lib port:ocaml port:readline port:ncurses port:ocaml-menhir
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/omake/files/patch-OCaml.om.diff b/devel/omake/files/patch-OCaml.om.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6b6abfe20e0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/omake/files/patch-OCaml.om.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f523799b609ebbda1b03df55028f2d98bfcffc52 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Gerd Stolpmann <gerd@figlyinc.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 10 Dec 2017 11:51:08 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix: configuration of C compiler for the case that "ocamlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -config" prints several words for "c_compiler"
</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;'>+ lib/build/OCaml.om | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/build/OCaml.om b/lib/build/OCaml.om
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8d00490..8fa3a6b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/build/OCaml.om
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/build/OCaml.om
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,7 +181,7 @@ private.get_bytecomp_c_comp() =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Figure out the params for the C compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private.c_comp = $(get_c_comp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if $(equal X$(c_comp)X, XX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if $(equal X$(string $(c_comp))X, XX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private.bytecomp_c_comp = $(get_bytecomp_c_comp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCAML_CC = $(nth-hd 1, $(bytecomp_c_comp))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCAML_CFLAGS = $(nth-tl 1, $(bytecomp_c_comp))
</span></pre><pre style='margin:0'>
</pre>