<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6060617db664a7ca586df1d8894da2054f7db75">https://github.com/macports/macports-ports/commit/b6060617db664a7ca586df1d8894da2054f7db75</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 b606061 ghc and ghc-bootstrap: specify compiler to clang-4.0
</span>b606061 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b6060617db664a7ca586df1d8894da2054f7db75
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Sep 24 15:28:31 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> ghc and ghc-bootstrap: specify compiler to clang-4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> on older systems and on 10.11
</span><span style='display:block; white-space:pre;color:#404040;'> and add a build and runtime dependency for clang-4.0
</span><span style='display:block; white-space:pre;color:#404040;'> as this compiler needs to be present when ghc is used.
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/54363
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/53709
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/50962
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/50480
</span>---
lang/ghc-bootstrap/Portfile | 11 ++++++++++-
lang/ghc/Portfile | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc-bootstrap/Portfile b/lang/ghc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf8a03d..d0772a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ name ghc-bootstrap
</span> set canonicalname ghc
# Note: 7.6.3 doesn't have a i386 darwin version at http://www.haskell.org/ghc/dist/7.6.3
version 7.6.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories lang haskell
maintainers cal openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,15 @@ compiler.blacklist-append \
</span> {clang < 503.0.38} \
macports-clang-3.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ghc needs a build and runtime dependency on the compiler used to build it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# same is also set in ghc-bootstrap. clang-4.0 works, is needed on older systems anyway
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# also /usr/bin/clang does not work on 10.11, so override it there
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ( ${os.major} < 13 || ${os.major} == 15 ) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:clang-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:clang-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args --prefix=${prefix}/share/ghc-bootstrap
configure.args --with-gcc=${configure.cc}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/Portfile b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ced671..2ca7406 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name ghc
</span> # When updating GHC, make sure to revbump all Haskell ports.
# Also make sure to update the version in the Haskell PortGroup.
version 7.8.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories lang haskell
maintainers cal openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,6 +80,15 @@ compiler.blacklist-append \
</span> {clang < 503.0.38} \
macports-clang-3.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ghc needs a build and runtime dependency on the compiler used to build it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# same is also set in ghc-bootstrap. clang-4.0 works, is needed on older systems anyway
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# also /usr/bin/clang does not work on 10.11, so override it there
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ( ${os.major} < 13 || ${os.major} == 15 ) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:clang-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:clang-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set bootstraproot ${prefix}/share/ghc-bootstrap
set llvmPrefix ${prefix}/libexec/llvm-3.5
configure.args --with-ghc=${bootstraproot}/bin/ghc \
</pre><pre style='margin:0'>
</pre>