<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d99f9779cba701494fc1047a5f4877936a8f0637">https://github.com/macports/macports-ports/commit/d99f9779cba701494fc1047a5f4877936a8f0637</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 d99f977 ocaml: fix build on 32bit Intel
</span>d99f977 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d99f9779cba701494fc1047a5f4877936a8f0637
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Dec 16 14:35:21 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> ocaml: fix build on 32bit Intel
</span>---
lang/ocaml/Portfile | 15 ++++++++++-----
lang/ocaml/files/patch-configure-darwin32.diff | 11 +++++++++++
2 files changed, 21 insertions(+), 5 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 f3b2288..9427322 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;'>@@ -28,11 +28,6 @@ long_description OCaml, originally named Objective Caml, is an industrial str
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-strnlen-socketaddr.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:ncurses
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +37,16 @@ set docdir ${prefix}/share/doc/${name}
</span>
compiler.blacklist gcc-4.0 *gcc-4.2 {clang < 400}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-strnlen-socketaddr.diff
</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;'>+ if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-configure-darwin32.diff
</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;'>+
</span> # Configure.
configure.pre_args -prefix ${prefix}
configure.args -cc ${configure.cc} -as \"${configure.cc} -c\" -aspp \"${configure.cc} -c\" \ -no-graph
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..673d8b9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-12-16 13:52:33.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-12-16 13:57:05.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -799,7 +799,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shared_libraries_supported=true;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-apple-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mksharedlib="$bytecc -bundle -flat_namespace -undefined suppress \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -Wl,-no_compact_unwind"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -Wl,-no_compact_unwind -read_only_relocs suppress"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytecccompopts="$dl_defs $bytecccompopts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dl_needs_underscore=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shared_libraries_supported=true;;
</span></pre><pre style='margin:0'>
</pre>