<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/777d81406cb9a7c261e921618c4ea39feba74389">https://github.com/macports/macports-ports/commit/777d81406cb9a7c261e921618c4ea39feba74389</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 777d81406cb ghc: Add depends_skip_archcheck for platform arm, Fix prebuilt issues
</span>777d81406cb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 777d81406cb9a7c261e921618c4ea39feba74389
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Wed Mar 16 17:38:53 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ghc: Add depends_skip_archcheck for platform arm, Fix prebuilt issues
</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/64794
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://trac.macports.org/ticket/64824
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes `libffi` conflict
</span>---
lang/ghc/Portfile | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 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 a6525166cde..2da9b274596 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;'>@@ -181,6 +181,8 @@ use_parallel_build no
</span> # binaries into ${prefix}, not DESTDIR. Work around this by setting
# --prefix=${destroot}${prefix} and not setting DESTDIR
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libffi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { [variant_isset "prebuilt"] } {
set bootstrap_dir ${destroot}${prefix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,6 +193,16 @@ if { [variant_isset "prebuilt"] } {
</span> # the PATH environment must provide the bootstrap path
build.env-append \
"PATH=$env(PATH):${bootstrap_dir}/bin"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid conflicts with libffi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f {ffi.h ffitarget.h} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/include/${f}] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && [file exists ${destroot}${prefix}/include/${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/include/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
set bootstrap_dir ${workpath}/bootstrap
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,11 +232,16 @@ if { [variant_isset "prebuilt"] } {
</span> port:texlive-latex-extra \
port:xz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build depends upon these x86_64 binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ happy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HsColour
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Add these MacPorts dependencies after this issue is fixed:
# https://gitlab.haskell.org/ghc/ghc/-/issues/18752
# depends_lib-append \
# port:gmp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # port:libffi \
</span> # port:libiconv
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -346,9 +363,15 @@ destroot {
</span> set workpath_destdir_pattern ${workpath}
post-destroot {
# fix rpath searches
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dylib_list {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${destroot}${prefix}/lib/${name}-${version} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [file isfile ${f}] && [string match "*.dylib" ${f}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend dylib_list ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> foreach f [concat \
[glob -type f ${destroot}${prefix}/lib/${name}-${version}/bin/*] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [glob -type f ${destroot}${prefix}/lib/${name}-${version}/*/*.dylib]] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dylib_list}] {
</span> if {[file executable ${f}]
|| [string match *.dylib ${f}]} {
fix_workpath_rpath ${f} \
</pre><pre style='margin:0'>
</pre>