<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/ba6b5b02be8acb1b270d3ba2e97679d8dc3e6ac1">https://github.com/macports/macports-ports/commit/ba6b5b02be8acb1b270d3ba2e97679d8dc3e6ac1</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 ba6b5b02be8 ghc: Bugfix build (#27470)
</span>ba6b5b02be8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ba6b5b02be8acb1b270d3ba2e97679d8dc3e6ac1
</span>Author: Steve Smith <essandess@users.noreply.github.com>
AuthorDate: Tue Jan 28 18:05:07 2025 -0500
<span style='display:block; white-space:pre;color:#404040;'> ghc: Bugfix build (#27470)
</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/71964
</span>---
_resources/port1.0/group/haskell_cabal-1.0.tcl | 32 +++++++++++---------------
lang/ghc/Portfile | 2 ++
2 files changed, 15 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/haskell_cabal-1.0.tcl b/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 08f09f6f509..deb4ee2b74a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/haskell_cabal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,16 +28,16 @@ proc haskell_cabal.add_dependencies {} {
</span> depends_patch-append \
port:cabal-prebuilt \
port:ghc-prebuilt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span> port:cabal-prebuilt \
port:ghc-prebuilt
} else {
depends_patch-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cabal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span> port:cabal \
port:ghc
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cabal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ghc \
</span> port:gmp \
port:libiconv
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,8 +187,6 @@ default haskell_cabal.global_flags {\
</span> }
default haskell_cabal.update_flags {\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --ghc\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-compiler=${prefix}/bin/ghc\
</span> --prefix=${prefix}\
${haskell_cabal.installdir_args}\
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -232,16 +230,16 @@ post-patch {
</span> ${haskell_cabal.cabal_root}/bin/ghc-pkg
# provides symlinks to ${prefix}/bin/*-prebuilt for the rest
foreach f {\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cabal\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ghci\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- haddock\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hp2ps\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hpc\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hsc2hs\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runghc\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runhaskell\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/${f}-prebuilt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cabal\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ghci\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haddock\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hp2ps\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hpc\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hsc2hs\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runghc\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runhaskell\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/${f}-prebuilt \
</span> ${haskell_cabal.cabal_root}/bin/${f}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,8 +270,6 @@ default build.args {${build.target}}
</span> default build.post_args {\
[haskell_cabal.build_getjobsarg]\
--builddir=${haskell_cabal.build_dir}\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --ghc\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-compiler=${prefix}/bin/ghc\
</span> --prefix=${prefix}\
${haskell_cabal.installdir_args}\
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,8 +284,6 @@ default destroot.args {${destroot.target}}
</span> default destroot.post_args {\
[haskell_cabal.build_getjobsarg]\
--builddir=${haskell_cabal.build_dir}\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --ghc\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-compiler=${prefix}/bin/ghc\
</span> --installdir=${destroot}${prefix}/bin\
--install-method=copy\
--overwrite-policy=always\
<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 7582644fc94..ebe31fc0546 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;'>@@ -142,6 +142,8 @@ if {${name} eq ${subport}} {
</span> "OPT=${prefix}/bin/opt-mp-${ghc_llvm_version}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cmd ./configure
configure.pre_args \
--prefix=${prefix}
</pre><pre style='margin:0'>
</pre>