<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/cc086e1515994027c693c64227f18e82bdb7a8e7">https://github.com/macports/macports-ports/commit/cc086e1515994027c693c64227f18e82bdb7a8e7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cc086e1515994027c693c64227f18e82bdb7a8e7
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Sep 14 20:20:36 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> haskell_cabal PG: Bugfix build when exisiting ghc is installed
</span>---
_resources/port1.0/group/haskell_cabal-1.0.tcl | 57 +++++++++++++++-----------
1 file changed, 33 insertions(+), 24 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 a5845b74ef9..452f2fdccd7 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;'>@@ -86,6 +86,8 @@ post-extract {
</span> "relocatable: True" \
"install-method: copy" \
"installdir: ${prefix}/bin" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "logs-dir: [option haskell_cabal.cabal_root]/logs" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "store-dir: [option haskell_cabal.cabal_root]/store" \
</span> "" \
"install-dirs global" \
" prefix: ${prefix}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,11 +125,8 @@ default haskell_cabal.bin {[haskell_cabal.getcabalbin]}
</span> default haskell_cabal.env \
{CABAL_CONFIG=[option haskell_cabal.cabal_root]/config}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default haskell_cabal.global_flags {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --config-file=[option haskell_cabal.cabal_root]/config\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --logs-dir=[option haskell_cabal.cabal_root]/logs\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --store-dir=[option haskell_cabal.cabal_root]/store\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default haskell_cabal.global_flags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {--config-file=[option haskell_cabal.cabal_root]/config}
</span>
default haskell_cabal.build_dir {${workpath}/dist}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,29 +136,39 @@ default haskell_cabal.use_prebuilt {no}
</span> post-patch {
if {[tbool haskell_cabal.use_prebuilt]} {
xinstall -d ${haskell_cabal.cabal_root}/bin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bootstrap from *-prebuilt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the link to exedir_prebuilt got ghc and ghc-pkg is a hac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to accommodate cabal's hack method of locating ghc-pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.1.0.md
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ghc_prebuilt_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lindex [regexp -all -inline {[0-9.]+} [exec ${prefix}/bin/ghc-prebuilt --version]] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set exedir_prebuilt ${prefix}/lib/ghc-${ghc_prebuilt_version}-prebuilt/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${exedir_prebuilt}/ghc-${ghc_prebuilt_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${haskell_cabal.cabal_root}/bin/ghc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${exedir_prebuilt}/ghc-pkg-${ghc_prebuilt_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${haskell_cabal.cabal_root}/bin/ghc-pkg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # provides symlinks to ${prefix}/bin/*-prebuilt for the rest
</span> foreach f {\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cabal\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ghc\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ghc-pkg\
</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:#ffe0e0;'>- ${haskell_cabal.cabal_root}/bin/${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${haskell_cabal.cabal_root}/bin/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
haskell_cabal.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "GHC=${prefix}/bin/ghc-prebuilt" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${haskell_cabal.cabal_root}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GHC=${haskell_cabal.cabal_root}/bin/ghc" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PATH=${haskell_cabal.cabal_root}/bin:$env(PATH)"
</span> foreach phase {configure build destroot test} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GHC=${prefix}/bin/ghc-prebuilt" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PATH=${haskell_cabal.cabal_root}/bin:$env(PATH)"
</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> }
}
}
</pre><pre style='margin:0'>
</pre>