<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f6e3fa2ff301be85a0eb0e8ab310322a342fc3bf">https://github.com/macports/macports-ports/commit/f6e3fa2ff301be85a0eb0e8ab310322a342fc3bf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f6e3fa2ff301be85a0eb0e8ab310322a342fc3bf
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jan 24 20:05:35 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> dash: Fix detection of stat64 on arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62853
</span>---
shells/dash/Portfile | 5 ++++-
.../files/0001-fix-dirent64-et-al-on-darwin.patch | 22 ++------------------
shells/dash/files/stat64.patch | 24 ++++++++++++++++++++++
3 files changed, 30 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/dash/Portfile b/shells/dash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1b8a28fb44..9ff7eff8479 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/dash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/dash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,12 @@ checksums rmd160 d5a1845a9f11bcda5ee5afa4f35c692f91e0fa03 \
</span> sha256 62b9f1676ba6a7e8eaec541a39ea037b325253240d1f378c72360baa1cbcbc2a \
size 244507
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-fix-dirent64-et-al-on-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-fix-dirent64-et-al-on-darwin.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stat64.patch
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# We are patching configure.ac.
</span> use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.checks.implicit_function_declaration.whitelist-append strchr
</span>
livecheck.url [lindex ${master_sites} 0]
livecheck.regex ${name}-(\\d+(\\.\\d+)+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/dash/files/0001-fix-dirent64-et-al-on-darwin.patch b/shells/dash/files/0001-fix-dirent64-et-al-on-darwin.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c918a6411a..3ff452dc18f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/dash/files/0001-fix-dirent64-et-al-on-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/dash/files/0001-fix-dirent64-et-al-on-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,24 +2,9 @@ From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001
</span> From: Adrian Gierakowski <agierakowski@gmail.com>
Date: Sun, 19 Jul 2020 08:38:05 +0100
Subject: [PATCH] fix dirent64 et al on darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 11 +++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 11 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b8faca9..cee1e4d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig
</span> +++ configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [klibc has bsd_signal instead of signal])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl TODO: stat64 is deprecated since macOS 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check for stat64 (dietlibc/klibc).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNC(stat64,, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,6 +155,16 @@ AC_CHECK_FUNC(open64,, [
</span> AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit])
])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +21,3 @@ index b8faca9..cee1e4d 100644
</span> dnl Check if struct stat has st_mtim.
AC_MSG_CHECKING(for stat::st_mtim)
AC_COMPILE_IFELSE(
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.15.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/dash/files/stat64.patch b/shells/dash/files/stat64.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4e8bfbe0e94
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/dash/files/stat64.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+shell: Call CHECK_DECL on stat64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On macOS it is possible to find stat64 at link-time but not at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compile-time. To make the build process more robust we should
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+check for the header file as well as the library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://git.kernel.org/pub/scm/utils/dash/dash.git/commit/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,11 +140,12 @@ if test "$ac_cv_func_signal" != yes; then
</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;'>+ dnl Check for stat64 (dietlibc/klibc).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_CHECK_FUNC(stat64,, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_DECL(stat64, AC_CHECK_FUNC(stat64))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "$ac_cv_func_stat64" != yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(lstat64, lstat, [64-bit operations are the same as 32-bit])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(stat64, stat, [64-bit operations are the same as 32-bit])
</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;'>+ AC_CHECK_FUNC(glob64,, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(glob64_t, glob_t, [64-bit operations are the same as 32-bit])
</span></pre><pre style='margin:0'>
</pre>