<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/26edc250a889e4fd58493da48663248f263998cc">https://github.com/macports/macports-ports/commit/26edc250a889e4fd58493da48663248f263998cc</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 26edc250a88 guile-3.0: use 3.0.9 on 32-bit archs until 3.0.10 regression is fixed
</span>26edc250a88 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 26edc250a889e4fd58493da48663248f263998cc
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Sep 23 12:02:52 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> guile-3.0: use 3.0.9 on 32-bit archs until 3.0.10 regression is fixed
</span>---
lang/guile-3.0/Portfile | 52 +++++++++++++++++++++++++++++++++
lang/guile-3.0/files/0010-filesys.patch | 13 +++++++++
lang/guile-3.0/files/0011-powerpc.patch | 30 +++++++++++++++++++
3 files changed, 95 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile-3.0/Portfile b/lang/guile-3.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b821b2aeaa3..316957efbb3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/guile-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/guile-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,10 @@
</span>
PortSystem 1.0
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# dprintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span>
name guile-3.0
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,6 +19,18 @@ checksums rmd160 c42990081a8fffaf63874d16f457d8e50db8bc36 \
</span> sha256 2dbdbc97598b2faf31013564efb48e4fed44131d28e996c26abe8a5b23b56c2a \
size 9738824
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# At the moment 3.0.10 is broken on 32-bit platforms.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} in [list i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.0.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e5c6a757cc188f137edd2046a3d015152efad7fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 18525079ad29a0d46d15c76581b5d91c8702301bfd821666d2e1d13726162811 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9734735
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd ${prefix}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.c_standard 2011
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +59,11 @@ master_sites https://ftp.gnu.org/gnu/guile/
</span> # Fix MacOS specific bugs and make the test suite pass.
# Sent to upstream: https://www.mail-archive.com/bug-guile@gnu.org/msg11370.html
use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# On legacy systems passing -f is needed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# autoreconf: error: /opt/local/bin/autopoint failed with exit status: 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Since autoreconf is used anyway, we can add these flags unconditionally:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles \
0001-tests-Check-TCP_NODELAY-for-non-zero-instead-of-1.patch \
0002-tests-Skip-tests-of-abstract-Unix-sockets-on-Darwin.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,6 +113,37 @@ configure.args --program-suffix=-3.0 \
</span> --infodir="${prefix}/share/info/${name}" \
--mandir="${prefix}/share/man"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do we need this for ppc64 as well?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the prebuilt guile binaries are broken for Darwin PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/prebuilt/32-bit-big-endian ${worksrcpath}/prebuilt/32-bit-big-endian-disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "*** This build can take some time, as guile has to do a full bootstrap on PPC."
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We override patches here on purpose. Test suite will be dealt with once 3.0.10 is fixed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles 0009-posix.c-Set-errno-when-pipe2-is-not-available-and-fl.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0010-filesys.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0011-powerpc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-error-on-warning \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-jit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-64-calls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-threads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${configure.build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We override patches here on purpose. Test suite will be dealt with once 3.0.10 is fixed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles 0009-posix.c-Set-errno-when-pipe2-is-not-available-and-fl.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0010-filesys.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Notice that i386 build is untested. It may or may not require
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disabling JIT and threads.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-error-on-warning \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-64-calls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # fixes: sed: -i may not be used with stdin
depends_build-append port:gsed
configure.env-append SED=${prefix}/bin/gsed
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile-3.0/files/0010-filesys.patch b/lang/guile-3.0/files/0010-filesys.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0a68bad3683
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/guile-3.0/files/0010-filesys.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/libguile/filesys.c.orig 2024-09-22 13:46:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/libguile/filesys.c 2024-09-22 14:12:07.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +46,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/stdio.h> /* for renameat */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_DIRECT_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <direct.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile-3.0/files/0011-powerpc.patch b/lang/guile-3.0/files/0011-powerpc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d41e5f799a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/guile-3.0/files/0011-powerpc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://issues.guix.gnu.org/47615
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977223
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/am/bootstrap.am 2022-02-02 02:57:14.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/am/bootstrap.am 2022-04-16 23:50:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These variables can be set before you include bootstrap.am.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUILE_WARNINGS ?= -W1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GUILE_OPTIMIZATIONS ?= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GUILE_OPTIMIZATIONS ?= -O1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUILE_TARGET ?= $(host)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUILE_BUILD_TAG ?= BOOTSTRAP($(GUILE_BOOTSTRAP_STAGE))
</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;'>+--- a/stage0/Makefile.am 2022-02-02 02:57:14.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/stage0/Makefile.am 2022-04-16 23:50:24.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,10 @@
</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;'>+ GUILE_WARNINGS = -W0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GUILE_OPTIMIZATIONS = -O1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(info Note: adjusting GUILE_OPTIMIZATIONS for 32-bit big-endian architecture)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUILE_BOOTSTRAP_STAGE = stage0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include $(top_srcdir)/am/bootstrap.am
</span></pre><pre style='margin:0'>
</pre>