<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/954aa5eb0324adc9840ef3a57a4fd196667104aa">https://github.com/macports/macports-ports/commit/954aa5eb0324adc9840ef3a57a4fd196667104aa</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 954aa5e ocaml: remove unneeded "platform" variant, as we only support darwin
</span>954aa5e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 954aa5eb0324adc9840ef3a57a4fd196667104aa
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Tue Oct 22 15:59:14 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> ocaml: remove unneeded "platform" variant, as we only support darwin
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also, add some comments noting the port maintainer can't actually test
</span><span style='display:block; white-space:pre;color:#404040;'> older OSes and 32 bit Intel.
</span>---
lang/ocaml/Portfile | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 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 fc17c86..e7adb82 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;'>@@ -43,29 +43,31 @@ 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:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # need to add strnlen patch as not in library
</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;'>- # compiler selection pulls in clang-3.4 on 10.6 and less
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and this compiler is needed for this port to run once installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so force this compiler and require it at runtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:clang-3.4
</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;'>- if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure-darwin32.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;'>- # see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # mimic default values of default_as and default_aspp in configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "AS=${configure.cc} -arch ${build_arch} -Wno-trigraphs -c" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "ASPP=${configure.cc} -arch ${build_arch} -Wno-trigraphs -c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: the port maintainer has no access to older versions of MacOS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# debug problems with these patches.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # need to add strnlen patch as not in library
</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;'>+ # compiler selection pulls in clang-3.4 on 10.6 and less
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and this compiler is needed for this port to run once installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so force this compiler and require it at runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:clang-3.4
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: the port maintainer has no access to an i386 host, and cannot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# debug problems on one.
</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;'>+# see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# mimic default values of default_as and default_aspp in configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "AS=${configure.cc} -arch ${build_arch} -Wno-trigraphs -c" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ASPP=${configure.cc} -arch ${build_arch} -Wno-trigraphs -c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Configure.
configure.pre_args --prefix=${prefix} --mandir=${prefix}/share/man
configure.args --disable-graph-lib
</pre><pre style='margin:0'>
</pre>