<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1762b0ef881300f0009c861b60f459989c9e8193">https://github.com/macports/macports-ports/commit/1762b0ef881300f0009c861b60f459989c9e8193</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 1762b0e group/haskell_cabal: Use system gcc by setting build.env PATH
</span>1762b0e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1762b0ef881300f0009c861b60f459989c9e8193
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Thu Oct 3 15:12:39 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> group/haskell_cabal: Use system gcc by setting build.env PATH
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix build fail when `port select --set gcc mp-gcc*` is set
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Related: https://github.com/haskell/cabal/issues/1325
</span>---
_resources/port1.0/group/haskell_cabal-1.0.tcl | 11 +++++++++--
1 file changed, 9 insertions(+), 2 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 b579bab..f442c12 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;'>@@ -81,6 +81,13 @@ default build.cmd {${haskell_cabal.bin}}
</span> default build.target {new-build}
default build.args {${haskell_cabal.default_args}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# ensure /usr/bin/gcc is used; see https://github.com/haskell/cabal/issues/1325
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.env {PATH=${worksrcpath}/bin:$env(PATH)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${worksrcpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s /usr/bin/gcc ${worksrcpath}/bin/gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Note: cabal new-install does *not* use the specified --prefix'ed datadir
# Do not use new-install; rather, new-update / new-configure / new-build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,12 +112,12 @@ destroot {
</span>
# install documentation
if { [file isdirectory ${cabal_build}/doc] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/doc/${name}
</span> fs-traverse f_or_d ${cabal_build}/doc {
set subpath [strsed ${f_or_d} "s|${cabal_build}/doc||"]
if { ${subpath} ne "" } {
if { [file isdirectory ${f_or_d}] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d \
</span> ${destroot}${prefix}/share/doc/${name}${subpath}
} elseif { [file isfile ${f_or_d}] } {
xinstall -m 0644 ${f_or_d} \
</pre><pre style='margin:0'>
</pre>