<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/b7d18b8aa9b10b082019e21c273a4e3038790d90">https://github.com/macports/macports-ports/commit/b7d18b8aa9b10b082019e21c273a4e3038790d90</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b7d18b8aa9b10b082019e21c273a4e3038790d90
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sat Sep 17 23:27:06 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> cabal: Bugfix
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://github.com/macports/macports-ports/pull/16141#discussion_r973616866
</span>---
lang/cabal/Portfile | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/cabal/Portfile b/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8dd9c4e76d1..ad7c50379fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,18 +144,13 @@ if {${name} eq ${subport}} {
</span> path:bin/ghc:ghc
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- haskell_cabal.env-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GHC=${haskell_cabal.cabal_root}/bin/ghc" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "GHC=${prefix}/bin/ghc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- haskell_cabal.env-delete \
</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:#ffe0e0;'>- foreach phase {configure build destroot test} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${phase}.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {*}${haskell_cabal.env}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> delete ${haskell_cabal.cabal_root}/bin/ghc
delete ${haskell_cabal.cabal_root}/bin/ghc-pkg
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ haskell_cabal.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CABAL_CONFIG=${haskell_cabal.cabal_root}/config" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GHC=${prefix}/bin/ghc"
</span>
# https://github.com/haskell/cabal/issues/8360#issuecomment-1220918581
build.target ${name}-install \
</pre><pre style='margin:0'>
</pre>