<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/6c5a2fe68b1c1fcf5506e8f9a755e1cfd6cccd56">https://github.com/macports/macports-ports/commit/6c5a2fe68b1c1fcf5506e8f9a755e1cfd6cccd56</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 6c5a2fe68b1 gcl: fix build on old macOS and without emacs
</span>6c5a2fe68b1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6c5a2fe68b1c1fcf5506e8f9a755e1cfd6cccd56
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Wed Aug 2 01:09:30 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> gcl: fix build on old macOS and without emacs
</span>---
lang/gcl/Portfile | 22 ++++++++++++-
lang/gcl/files/old-macOS.patch | 74 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcl/Portfile b/lang/gcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 11a683db6f0..d00e9bf9c78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,8 @@ checksums rmd160 d64bb58a38ce45d6c4cf67cec4dff1dc52197a55 \
</span> size 11725385
patchfiles dont-override-CC-or-MACOSX_DEPLOYMENT_TARGET.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fix-memory-corruption-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-memory-corruption-on-macOS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ old-macOS.patch
</span>
# checking for required object alignment... configure: error: Cannot find object alignent
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +51,25 @@ configure.args --disable-notify \
</span> --without-x \
--disable-xgcl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# prevent it from picking system emacs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append EMACS=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# anyway, we need to provide the right path to default.el
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|EMACS_DEFAULT_EL=|EMACS_DEFAULT_EL=${prefix}/etc/default.el|g" makedefs makedefc
</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;'>+# /usr/bin/libtool: object: ... malformed object (unknown load command 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/libtool|${prefix}/bin/libtool|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ h/386-macosx.defs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ h/powerpc-macosx.defs
</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> use_parallel_build no
variant x11 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcl/files/old-macOS.patch b/lang/gcl/files/old-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..49973c5a50e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcl/files/old-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5d0926f03527ed236dd045f3ca77f44628fc73a6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 1 Aug 2023 22:14:06 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Detect by configure availability of readlinkat
</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;'>+ configure | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.in | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ h/gclincl.h.in | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ o/unixfsys.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 14 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8d086abaa..e10fa1af1 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7865,6 +7865,14 @@ else $as_nop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</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;'>++# Not each system has readlinkat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_fn_c_check_func "$LINENO" "readlinkat" "ac_cv_func_readlinkat"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x$ac_cv_func_readlinkat" = xyes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "%s\n" "#define HAVE_READLINKAT 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</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;'>+ ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_header_sys_ioctl_h" = xyes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.in configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4628ea2a0..e4f0a7a92 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1601,6 +1601,8 @@ AC_CHECK_FUNCS(getwd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNC(uname, , AC_DEFINE(NO_UNAME,1,[no uname call]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNC(gettimeofday, , AC_DEFINE(NO_GETTOD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Not each system has readlinkat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_FUNCS(readlinkat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS(sys/ioctl.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git h/gclincl.h.in h/gclincl.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 343e7ddda..bd16cd438 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- h/gclincl.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ h/gclincl.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,6 +183,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the <readline/readline.h> header file. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_READLINE_READLINE_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to 1 if you have the `readlinkat' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_READLINKAT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* have readline completion matches */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_RL_COMPENTRY_FUNC_T
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git o/unixfsys.c o/unixfsys.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6e1ea8b8f..ad56e7a7a 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- o/unixfsys.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ o/unixfsys.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,7 +268,7 @@ DEFUN_NEW("READLINKAT",object,fSreadlinkat,SI,2,2,NONE,OI,OO,OO,OO,(fixnum d,obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ massert(z1<sizeof(FN1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(FN1,s->st.st_self,z1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FN1[z1]=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef __MINGW32__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_READLINKAT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ massert((l=readlinkat(d ? dirfd((DIR *)d) : AT_FDCWD,FN1,FN2,sizeof(FN2)))>=0 && l<sizeof(FN2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ l=0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>