<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/16bf91aad3fb09da600736391ac522752ee4227a">https://github.com/macports/macports-ports/commit/16bf91aad3fb09da600736391ac522752ee4227a</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 16bf91a ghc: Update to version 8.8.3
</span>16bf91a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 16bf91aad3fb09da600736391ac522752ee4227a
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue Feb 25 18:02:21 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> ghc: Update to version 8.8.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://trac.macports.org/ticket/59467
</span>---
lang/ghc/Portfile | 77 ++++++++++++++++++++++++++-----------------------------
1 file changed, 37 insertions(+), 40 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 7bfc57b..39c886a 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;'>@@ -4,12 +4,13 @@ PortSystem 1.0
</span> PortGroup gpg_verify 1.0
name ghc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.6.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories lang haskell
maintainers {ieee.org:s.t.smith @essandess} openmaintainer
license BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64
</span>
description The Glorious Glasgow Haskell Compilation System
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +26,7 @@ long_description \
</span> GHC comes with a generational garbage collector, \
and a space and time profiler.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://haskell.org/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://haskell.org/${name}
</span>
# Bootstrapped ghc is the default build
variant prebuilt \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,15 +39,13 @@ master_sites https://downloads.haskell.org/~${name}/${version}
</span> distfiles ${distname}-x86_64-apple-darwin${extract.suffix} \
${distname}-testsuite${extract.suffix}
checksums ${distname}-x86_64-apple-darwin${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 618664b03640f58ebe28999c1c3bd3fc56c8ff7c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dfc1bdb1d303a87a8552aa17f5b080e61351f2823c2b99071ec23d0837422169 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 159042284 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0c50b7e11babbbf6ba0d5d0c8e6ebfec3f3246f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7016de90dd226b06fc79d0759c5d4c83c2ab01d8c678905442c28bd948dbb782 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 190133108 \
</span> ${distname}-testsuite${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9e4cb087bc8163feab7793f835916bdfd277868b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 21391cb63a8a6b327f6c9519217a3dad39493e72c48967008ae35af142ca895f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1910060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b474fa937aaadc2bc6b38ff31de3e55d84ae7310 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f9caa452f458e3b540e323bf8216e2712ed21576e205acddd4e2504ad2ad62d0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1965236 \
</span>
gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,9 +99,9 @@ if { [variant_isset "prebuilt"] } {
</span> ${distname}-src${extract.suffix}
checksums-append \
${distname}-src${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2640736ab93348a6f9550d914d811c0e62b77e50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4d4aa1e96f4001b934ac6193ab09af5d6172f41f5a5d39d8e43393b9aafee361 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19092168
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3945b5e40a90bdd6d7531791087e485e8b4605e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0dcc0aaf3e234c5978f29e6df62947e97720ab404ec0158343df211c5480f89 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19343672
</span>
depends_build-append \
port:alex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,11 +122,12 @@ if { [variant_isset "prebuilt"] } {
</span>
# add the bootstrap binary and the sphinx-build binary to PATH
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GHC=${bootstrap_dir}/bin/ghc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PATH=$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin"
</span>
# overwrite `build.env`
build.env \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PATH=$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin"
</span>
pre-build {
# test: move extracted testsuite directory to src
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,36 +167,26 @@ if { [variant_isset "prebuilt"] } {
</span> ${f}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${srcpath}/${distname} "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./boot \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${srcpath}/${distname} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "export PATH=$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ./boot"
</span>
# configure
# install the final compiler to destroot
configure.pre_args \
--prefix=${destroot}${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set configure_args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-ghc=${bootstrap_dir}/bin/ghc
</span> configure.dir ${srcpath}/${distname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${srcpath}/${distname} "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=/usr/bin:$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure.cmd} ${configure.pre_args} ${configure_args} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${srcpath}/${distname} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "export ${configure.env};\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.cmd} ${configure.pre_args}"
</span>
# build and destroot the second stage: `make && make install`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${srcpath}/${distname} "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=/usr/bin:$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.cmd} [portbuild::build_getjobsarg] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${srcpath}/${distname} "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=/usr/bin:$env(PATH):${bootstrap_dir}/bin:${frameworks_dir}/Python.framework/Versions/${python3_version}/bin ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.cmd} ${destroot.pre_args} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${srcpath}/${distname} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "export ${build.env};\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.cmd} [portbuild::build_getjobsarg]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${srcpath}/${distname} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "export ${build.env};\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.cmd} ${destroot.pre_args}"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,7 +197,7 @@ configure.pre_args --prefix=${bootstrap_dir}
</span> # note: this command does not change the destroot PATH environment, so export
# PATH explicitly in the necessary system command below
build.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=$env(PATH):${bootstrap_dir}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PATH=$env(PATH):${bootstrap_dir}/bin"
</span>
# Note: `make install` in bootstrap build cannot use a parallel build
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,9 +223,10 @@ post-activate {
</span> system "${prefix}/bin/ghc-pkg recache"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env-append "PATH=$env(PATH):${bootstrap_dir}/bin"
</span> test.dir ${worksrcpath}/testsuite
test.target test
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span>
notes "The GHC User Manual is available at:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,3 +235,9 @@ notes "The GHC User Manual is available at:
</span>
Copy/edit ${prefix}/etc/ghci.conf to your directory ~/.ghc
for a user-specific startup configuration."
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# livecheck broken on downloads.haskell.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://lists.macports.org/pipermail/macports-dev/2019-December/041581.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#livecheck.url https://downloads.haskell.org/~${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#livecheck.regex (\\d+(?:\\.\\d+){1,3})
</span></pre><pre style='margin:0'>
</pre>