<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/091c14ff910e008baac330a1506692fe2f581fef">https://github.com/macports/macports-ports/commit/091c14ff910e008baac330a1506692fe2f581fef</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 091c14ff910 alpine: Fix build with Xcode 16/clang 16 (macOS 15)
</span>091c14ff910 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 091c14ff910e008baac330a1506692fe2f581fef
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Wed Sep 18 12:31:07 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> alpine: Fix build with Xcode 16/clang 16 (macOS 15)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Alpine’s configure script contains a check to detect the parameter type
</span><span style='display:block; white-space:pre;color:#404040;'> accepted by qsort’s comparison function. It does this by doing a trial
</span><span style='display:block; white-space:pre;color:#404040;'> compilation of a program with a comparison function that accepts two
</span><span style='display:block; white-space:pre;color:#404040;'> void* parameters, which is the modern form specified by the standard,
</span><span style='display:block; white-space:pre;color:#404040;'> and checking whether compilation succeeded. If compilation fails, it
</span><span style='display:block; white-space:pre;color:#404040;'> assumes the historic pre-standard form, which uses char* parameters, and
</span><span style='display:block; white-space:pre;color:#404040;'> configures Alpine accordingly.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The program for the test comparison is written in an archaic style that,
</span><span style='display:block; white-space:pre;color:#404040;'> among other things, does not explicitly declare the comparison
</span><span style='display:block; white-space:pre;color:#404040;'> function’s return type. This can be the subject of a compiler warning,
</span><span style='display:block; white-space:pre;color:#404040;'> -Wimplicit-int.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Clang 16, included in Xcode 16, enables -Werror=implicit-int by
</span><span style='display:block; white-space:pre;color:#404040;'> default[1], as does GCC 14[2]. Because this condition is now an error,
</span><span style='display:block; white-space:pre;color:#404040;'> the trial compilation began failing under these compilers, causing
</span><span style='display:block; white-space:pre;color:#404040;'> Alpine to be configured to use char* parameters in qsort comparison
</span><span style='display:block; white-space:pre;color:#404040;'> functions. Because this does not match qsort’s actual declaration, where
</span><span style='display:block; white-space:pre;color:#404040;'> comparison functions are expected to use void* parameters, this would
</span><span style='display:block; white-space:pre;color:#404040;'> result in a build failure.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The program used to detect the proper type to use for qsort’s comparison
</span><span style='display:block; white-space:pre;color:#404040;'> functions is updated to avoid the -Wimplicit-int problem.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://releases.llvm.org/16.0.0/tools/clang/docs/ReleaseNotes.html#potentially-breaking-changes
</span><span style='display:block; white-space:pre;color:#404040;'> [2] https://gcc.gnu.org/gcc-14/porting_to.html#warnings-as-errors
</span>---
mail/alpine/Portfile | 3 +-
mail/alpine/files/patch-fix-applekeychain.diff | 13 --------
mail/alpine/files/patch-werror_implicit-int.diff | 41 ++++++++++++++++++++++++
3 files changed, 43 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/Portfile b/mail/alpine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 24507eb9032..a50a8a701f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/alpine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/alpine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,8 @@ depends_lib-append port:gettext-runtime \
</span> port:libiconv \
port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-applekeychain.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-applekeychain.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-werror_implicit-int.diff
</span> patch.pre_args-replace -p0 -p1
configure.env SSLDIR=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/files/patch-fix-applekeychain.diff b/mail/alpine/files/patch-fix-applekeychain.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 68f4979d5a8..23aed86f17b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/alpine/files/patch-fix-applekeychain.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/alpine/files/patch-fix-applekeychain.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,19 +164,6 @@ index 5a61bde..05b09b2 100644
</span> if test -z "$alpine_SYSTEM_PASSFILE" ; then
alpine_PASSFILE=".alpine.pwd"
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/pith/pine.hlp b/pith/pine.hlp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 74c2d25..60ee304 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/pith/pine.hlp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/pith/pine.hlp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -147,7 +147,7 @@ with help text for the config screen and the composer that didn't have any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reasonable place to be called from.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Dummy change to get revision in pine.hlp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ============= h_revision =================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Alpine Commit 649 2022-06-02 18:13:05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Alpine Commit 659 2022-08-27 15:11:35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ============= h_news =================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <HTML>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <HEAD>
</span> --
2.11.4.GIT
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/alpine/files/patch-werror_implicit-int.diff b/mail/alpine/files/patch-werror_implicit-int.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f0cc5200217
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/alpine/files/patch-werror_implicit-int.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0c44e2ae8b861e06139cfc6377cc59db0f12f781 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Eduardo Chappa <chappa@washington.edu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 27 Nov 2022 17:24:57 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] * Fixes to the configure script by Florian Meyer (to fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ an implicit cast to int in a declaration of a function).
</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 | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pith/pine.hlp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e6d7a705fb88..5d29dc3ba6c3 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22039,7 +22039,7 @@ else
</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;'>+ extern void *base;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern sortf(const void *, const void *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int sortf(const void *, const void *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sortf(a, b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void *a;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void *b; { return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 05b09b2e9537..f96a4c248b39 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1969,7 +1969,7 @@ ac_cv_func_qsort_argtype,
</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;'>+ extern void *base;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern sortf(const void *, const void *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int sortf(const void *, const void *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sortf(a, b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void *a;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const void *b; { return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>