<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/fa4a2c311423ea36bdfde6cba90ca29346918fcb">https://github.com/macports/macports-ports/commit/fa4a2c311423ea36bdfde6cba90ca29346918fcb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fa4a2c311423ea36bdfde6cba90ca29346918fcb
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed May 18 04:34:55 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> ninja: Update to 1.11.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: #14869
</span>---
devel/ninja/Portfile | 10 ++++----
.../files/patch-configure.py-bootstrap-only.diff | 6 ++---
devel/ninja/files/patch-tiger-no-posix-spawn.diff | 12 +++++-----
devel/ninja/files/patch-tiger-sysconf.diff | 27 +++++++++++-----------
4 files changed, 27 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/Portfile b/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eb9588035e8..4ba65799ead 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ninja/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,12 @@ PortSystem 1.0
</span> PortGroup github 1.0
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ninja-build ninja 1.10.2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ninja-build ninja 1.11.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1346989347fbb47b7211c1a49d5f9236f3027488 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 213959
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 887b9248abc0ba76de771092d70ef13e93ccc5b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3c6ba2e66400fe3f1ae83deb4b235faf3137ec20bd5b08c29bfc368db143e4c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 229475
</span>
categories devel
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/files/patch-configure.py-bootstrap-only.diff b/devel/ninja/files/patch-configure.py-bootstrap-only.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ac503f8b8d..024612309d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/files/patch-configure.py-bootstrap-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ninja/files/patch-configure.py-bootstrap-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> When running ./configure.py --bootstrap, do not automatically run ./ninja
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig 2020-01-27 04:37:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2020-01-28 05:59:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -682,28 +682,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig 2022-05-15 10:08:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2022-05-18 04:18:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -693,28 +693,3 @@
</span> n.close()
print('wrote %s.' % BUILD_FILENAME)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/files/patch-tiger-no-posix-spawn.diff b/devel/ninja/files/patch-tiger-no-posix-spawn.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ab0b19aefd7..813ee78304e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/files/patch-tiger-no-posix-spawn.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ninja/files/patch-tiger-no-posix-spawn.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/subprocess-posix.cc.orig 2020-08-18 14:28:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/subprocess-posix.cc 2020-08-26 09:44:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/subprocess-posix.cc.orig 2022-05-15 10:08:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/subprocess-posix.cc 2022-05-18 04:18:56.000000000 -0500
</span> @@ -22,7 +22,6 @@
#include <stdio.h>
#include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span>
#include "util.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,74 +57,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,74 +59,61 @@
</span> #endif // !USE_PPOLL
SetCloseOnExec(fd_);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,9 +144,9 @@
</span>
close(output_pipe[1]);
return true;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/subprocess_test.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/subprocess_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -224,8 +224,7 @@ TEST_F(SubprocessTest, SetWithLots) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/subprocess_test.cc.orig 2022-05-15 10:08:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/subprocess_test.cc 2022-05-18 04:18:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -226,8 +226,7 @@
</span> rlimit rlim;
ASSERT_EQ(0, getrlimit(RLIMIT_NOFILE, &rlim));
if (rlim.rlim_cur < kNumProcs) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ninja/files/patch-tiger-sysconf.diff b/devel/ninja/files/patch-tiger-sysconf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 251f29c6c31..1c26274d8d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ninja/files/patch-tiger-sysconf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ninja/files/patch-tiger-sysconf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/util.cc.orig 2020-01-27 04:37:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/util.cc 2020-01-28 06:02:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,6 +54,47 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "edit_distance.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "metrics.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util.cc.orig 2022-05-15 10:08:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util.cc 2022-05-18 04:31:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,6 +62,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace std;
</span>
+#ifdef __APPLE__
+#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,18 +48,17 @@
</span> void Fatal(const char* msg, ...) {
va_list ap;
fprintf(stderr, "ninja: fatal: ");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -492,8 +533,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return CPU_COUNT(&set);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -720,7 +761,12 @@
</span> }
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cgroupCount >= 0 && schedCount >= 0) return std::min(cgroupCount, schedCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (cgroupCount < 0 && schedCount < 0) return sysconf(_SC_NPROCESSORS_ONLN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cgroupCount < 0 && schedCount < 0)
</span> +#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return tigersysconf(_SC_NPROCESSORS_ONLN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return tigersysconf(_SC_NPROCESSORS_ONLN);
</span> +#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return sysconf(_SC_NPROCESSORS_ONLN);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return sysconf(_SC_NPROCESSORS_ONLN);
</span> +#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ return std::max(cgroupCount, schedCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(_WIN32) || defined(__CYGWIN__)
</span></pre><pre style='margin:0'>
</pre>