<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aefb9f3b6a894969635978b9bcfa275d6ba9e5a5">https://github.com/macports/macports-ports/commit/aefb9f3b6a894969635978b9bcfa275d6ba9e5a5</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 aefb9f3b6a8 libfaketime: fix build on 10.13
</span>aefb9f3b6a8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aefb9f3b6a894969635978b9bcfa275d6ba9e5a5
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Aug 27 00:58:51 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> libfaketime: fix build on 10.13
</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/68045
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68034
</span>---
sysutils/libfaketime/Portfile | 24 +++++++++++++++-------
.../files/patch-clock_xxx_cputime_id.diff | 23 ++++++++-------------
2 files changed, 26 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/libfaketime/Portfile b/sysutils/libfaketime/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a88f469f65..901846938ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/libfaketime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/libfaketime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,12 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.1
</span> PortGroup legacysupport 1.1
github.setup wolfcw libfaketime 0.9.10 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
platforms darwin
maintainers {@catap korins.ky:kirill} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,22 +28,29 @@ checksums rmd160 a1f4403d48c3c61fc797b5b376830408989cc5de \
</span>
depends_run-append path:bin/gdate:coreutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Needed for O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# timespec_get() and others
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 17
</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;'>+ # FAKE_SETTIME requires `clock_settime` which doesn't support by legacysupport yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-DFAKE_SETTIME||g" ${worksrcpath}/src/Makefile.OSX
</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:#ffe0e0;'>-# Ensure CLOCK_xxx_CPUTIME_ID are defined. Necessary for 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: should be removed after https://github.com/macports/macports-legacy-support/pull/64
</span> patchfiles-append patch-clock_xxx_cputime_id.diff
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.blacklist *cc* *dragonegg*
build.args PREFIX=${prefix}
build.env CC=${configure.cc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span>
destroot.args ${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/libfaketime/files/patch-clock_xxx_cputime_id.diff b/sysutils/libfaketime/files/patch-clock_xxx_cputime_id.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index faac8e497b5..3671fd013c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/libfaketime/files/patch-clock_xxx_cputime_id.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/libfaketime/files/patch-clock_xxx_cputime_id.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libfaketime.c.orig 2023-05-18 16:12:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libfaketime.c 2023-05-18 16:16:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,10 +87,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CLOCK_REALTIME CALENDAR_CLOCK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Monotonic system-wide clock. (== 0) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/libfaketime.c src/libfaketime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3acd571..fa03f57 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libfaketime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libfaketime.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,8 +122,6 @@ extern char *__progname;
</span> #define CLOCK_MONOTONIC SYSTEM_CLOCK
<span style='display:block; white-space:pre;background:#ffe0e0;'>--/* High-resolution timer from the CPU. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define CLOCK_PROCESS_CPUTIME_ID 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* High-resolution timer from the CPU. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CLOCK_PROCESS_CPUTIME_ID 2
</span> -/* Thread-specific CPU-time clock. */
-#define CLOCK_THREAD_CPUTIME_ID 3
/* Monotonic system-wide clock, not adjusted for frequency scaling. */
#define CLOCK_MONOTONIC_RAW 4
typedef int clockid_t;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,6 +95,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,6 +138,12 @@ void do_macos_dyld_interpose(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef CLOCK_PROCESS_CPUTIME_ID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* High-resolution timer from the CPU. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define CLOCK_PROCESS_CPUTIME_ID 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +#ifndef CLOCK_THREAD_CPUTIME_ID
+/* High-resolution timer from the CPU. */
+/* Thread-specific CPU-time clock. */
</pre><pre style='margin:0'>
</pre>