<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/7588f1cf3161366f5f9e91e2b7c07cf51bdb1d69">https://github.com/macports/macports-ports/commit/7588f1cf3161366f5f9e91e2b7c07cf51bdb1d69</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 7588f1cf316 ninja: Update to 1.10.1
</span>7588f1cf316 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7588f1cf3161366f5f9e91e2b7c07cf51bdb1d69
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Aug 26 10:26:22 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> ninja: Update to 1.10.1
</span>---
devel/ninja/Portfile | 8 +++----
devel/ninja/files/patch-tiger-no-posix-spawn.diff | 27 +++++++++++++----------
2 files changed, 19 insertions(+), 16 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 2bdad86cdea..8f1acd3c26d 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;'>@@ -6,11 +6,11 @@ PortGroup github 1.0
</span> PortGroup muniversal 1.0
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ninja-build ninja 1.10.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ninja-build ninja 1.10.1 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cebdbc2b0d7b1d393ef6c3e449e902463b135eed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 210313
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 eae3276f1af301d1784b4ebc27fc9318195c75e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a6b6f7ac360d4aabd54e299cc1d8fa7b234cd81b9401693da21221c62569a23e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 211216
</span>
categories devel
platforms darwin
<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 0e8076be793..ab0b19aefd7 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,16 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/subprocess-posix.cc~ 2019-02-18 23:10:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/subprocess-posix.cc 2019-02-18 23:17:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,9 +23,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/subprocess-posix.cc.orig 2020-08-18 14:28:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/subprocess-posix.cc 2020-08-26 09:44:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,6 @@
</span> #include <stdio.h>
#include <string.h>
#include <sys/wait.h>
-#include <spawn.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(USE_PPOLL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <poll.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +29,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/select.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -extern char** environ;
#include "util.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,74 +51,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,74 +57,61 @@
</span> #endif // !USE_PPOLL
SetCloseOnExec(fd_);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,7 +113,9 @@
</span> -#ifdef POSIX_SPAWN_USEVFORK
- flags |= POSIX_SPAWN_USEVFORK;
-#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ execl("/bin/sh", "/bin/sh", "-c", command.c_str(), (char *) NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } while (false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - err = posix_spawnattr_setflags(&attr, flags);
- if (err != 0)
- Fatal("posix_spawnattr_setflags: %s", strerror(err));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,9 +132,6 @@
</span> - err = posix_spawn_file_actions_destroy(&action);
- if (err != 0)
- Fatal("posix_spawn_file_actions_destroy: %s", strerror(err));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ execl("/bin/sh", "/bin/sh", "-c", command.c_str(), (char *) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } while (false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> + // If we get here, something went wrong; the execl should have
+ // replaced us.
+ char* err = strerror(errno);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,9 +144,7 @@
</span>
close(output_pipe[1]);
return true;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/subprocess_test.cc src/subprocess_test.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0a8c206..672a2f1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/subprocess_test.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/subprocess_test.cc.orig
</span> +++ src/subprocess_test.cc
@@ -224,8 +224,7 @@ TEST_F(SubprocessTest, SetWithLots) {
rlimit rlim;
</pre><pre style='margin:0'>
</pre>