<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7662717e6352937e40c4cb3d2ae25d1fa08ff6fb">https://github.com/macports/macports-ports/commit/7662717e6352937e40c4cb3d2ae25d1fa08ff6fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7662717e6352937e40c4cb3d2ae25d1fa08ff6fb
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue Sep 13 18:08:31 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ghc: Bugfix dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://trac.macports.org/ticket/65834
</span>---
lang/ghc/Portfile | 45 ++++++++++++++++++++-------------------------
1 file changed, 20 insertions(+), 25 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 1864f66c849..5a564cd206e 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;'>@@ -7,7 +7,7 @@ PortGroup legacysupport 1.1
</span>
name ghc
version 9.4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories lang haskell
maintainers {ieee.org:s.t.smith @essandess} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,7 +180,9 @@ if {${name} eq ${subport}} {
</span> port:xz
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses
</span>
# build depends upon these x86_64 binaries
depends_skip_archcheck-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -226,11 +228,13 @@ if {${name} eq ${subport}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach phase {configure build destroot test} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haskell_cabal.env-replace \
</span> "PATH=${haskell_cabal.cabal_root}/bin:$env(PATH)" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PATH=${workpath}/bin:${haskell_cabal.cabal_root}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach phase {configure build destroot test} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${phase}.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${haskell_cabal.env}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,14 +252,6 @@ if {${name} eq ${subport}} {
</span> --with-iconv-includes=${prefix}/include \
--with-iconv-libraries=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CPPFLAGS=${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-build {
system -W ${build.dir} \
"${build.cmd} docs [haskell_cabal.build_getjobsarg]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -382,6 +378,15 @@ subport ghc-prebuilt {
</span> subport hadrian {
# find ${worksrcpath} -type f -exec egrep -E -o '"pkg-name":"shake","pkg-version":"[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+"' {} ';'
version 0.19.6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-${ghc_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles [lindex ${ghc_source_checksums} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums {*}${ghc_source_checksums}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extract.only [lindex ${ghc_source_checksums} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set worksrcpath ${workpath}/${worksrcdir}/${subport}
</span>
variant stack \
description {Use stack to build.} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -424,17 +429,7 @@ subport hadrian {
</span> patchfiles-append \
patch-cabal_project.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach phase {build destroot test} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.post_args-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target-append \
</span> --project-file=cabal.project
<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;'>- distname ${name}-${ghc_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles [lindex ${ghc_source_checksums} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums {*}${ghc_source_checksums}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.only [lindex ${ghc_source_checksums} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${distname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set worksrcpath ${workpath}/${worksrcdir}/${subport}
</span> }
</pre><pre style='margin:0'>
</pre>