<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d7385a7810b647a44b555a5ab660bf29fda225f4">https://github.com/macports/macports-ports/commit/d7385a7810b647a44b555a5ab660bf29fda225f4</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 d7385a7 Fix broken ghc port, and add a patch to make it work on Sierra.
</span>d7385a7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d7385a7810b647a44b555a5ab660bf29fda225f4
</span>Author: Albert Gräf <aggraef@gmail.com>
AuthorDate: Wed Feb 15 11:28:55 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> Fix broken ghc port, and add a patch to make it work on Sierra.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/52424
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52582
</span>---
lang/ghc/Portfile | 10 +++++++---
lang/ghc/files/patch-sierra-compatibility.diff | 13 +++++++++++++
2 files changed, 20 insertions(+), 3 deletions(-)
<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 c178d14..db15a77 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 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories lang haskell
maintainers cal openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,13 +51,17 @@ depends_build port:ghc-bootstrap \
</span> depends_lib port:gmp \
port:ncurses \
port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:llvm-3.9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:llvm-3.5 \
</span> port:libffi
patchfiles patch-configure-workaround-bsdsed-incompatibility.diff \
patch-configure-disable-docs.diff \
patch-unix_lib_osx_sandbox_compatibility.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 16 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-sierra-compatibility.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
test.run yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +81,7 @@ compiler.blacklist-append \
</span> macports-clang-3.3
set bootstraproot ${prefix}/share/ghc-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvmPrefix ${prefix}/libexec/llvm-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvmPrefix ${prefix}/libexec/llvm-3.5
</span> configure.args --with-ghc=${bootstraproot}/bin/ghc \
--with-iconv-includes=${prefix}/include \
--with-iconv-libraries=${prefix}/lib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/files/patch-sierra-compatibility.diff b/lang/ghc/files/patch-sierra-compatibility.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..65699cd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/files/patch-sierra-compatibility.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rts/posix/GetTime.c.orig 2017-02-15 08:41:47.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rts/posix/GetTime.c 2017-02-15 08:43:42.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <papi.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef darwin_HOST_OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/mach_time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ! ((defined(HAVE_GETRUSAGE) && !irix_HOST_OS) || defined(HAVE_TIMES))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error No implementation for getProcessCPUTime() available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>