From b8db698acd7006415139fb2c6a26a0789836abc115066c1f517ce95cab605ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 1 Jul 2015 08:59:14 +0000
Subject: [PATCH] Accepting request 314674 from
 home:mathletic:branches:devel:tools:building

update to ninja 1.6.0.
Use Python 3 for configuration.

OBS-URL: https://build.opensuse.org/request/show/314674
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=21
---
 ninja-disable-maxprocs-test.patch | 15 ++++++++-------
 ninja.changes                     | 25 +++++++++++++++++++++++++
 ninja.spec                        |  6 +++---
 v1.5.3.tar.gz                     |  3 ---
 v1.6.0.tar.gz                     |  3 +++
 5 files changed, 39 insertions(+), 13 deletions(-)
 delete mode 100644 v1.5.3.tar.gz
 create mode 100644 v1.6.0.tar.gz

diff --git a/ninja-disable-maxprocs-test.patch b/ninja-disable-maxprocs-test.patch
index b279680..4b5118d 100644
--- a/ninja-disable-maxprocs-test.patch
+++ b/ninja-disable-maxprocs-test.patch
@@ -1,8 +1,8 @@
-Index: ninja-1.5.3/src/subprocess_test.cc
+Index: ninja-1.6.0/src/subprocess_test.cc
 ===================================================================
---- ninja-1.5.3.orig/src/subprocess_test.cc
-+++ ninja-1.5.3/src/subprocess_test.cc
-@@ -166,38 +166,6 @@ TEST_F(SubprocessTest, SetWithMulti) {
+--- ninja-1.6.0/src/subprocess_test.cc.orig
++++ ninja-1.6.0/src/subprocess_test.cc
+@@ -215,38 +215,6 @@
    }
  }
  
@@ -17,8 +17,8 @@ Index: ninja-1.5.3/src/subprocess_test.cc
 -  // Make sure [ulimit -n] isn't going to stop us from working.
 -  rlimit rlim;
 -  ASSERT_EQ(0, getrlimit(RLIMIT_NOFILE, &rlim));
--  if (!EXPECT_GT(rlim.rlim_cur, kNumProcs)) {
--    printf("Raise [ulimit -n] well above %u to make this test go\n", kNumProcs);
+-  if (rlim.rlim_cur < kNumProcs) {
+-    printf("Raise [ulimit -n] well above %u (currently %lu) to make this test go\n", kNumProcs, rlim.rlim_cur);
 -    return;
 -  }
 -
@@ -36,8 +36,9 @@ Index: ninja-1.5.3/src/subprocess_test.cc
 -  }
 -  ASSERT_EQ(kNumProcs, subprocs_.finished_.size());
 -}
--#endif  // !__APPLE__ && !_WIN32 
+-#endif  // !__APPLE__ && !_WIN32
 -
  // TODO: this test could work on Windows, just not sure how to simply
  // read stdin.
  #ifndef _WIN32
+ 
\ No newline at end of file
diff --git a/ninja.changes b/ninja.changes
index ae7d9c7..708c22d 100644
--- a/ninja.changes
+++ b/ninja.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Jul  1 08:04:09 UTC 2015 - foss@grueninger.de
+
+- Update to version 1.6.0
+  * rules are now scoped to the subninja they're in.
+  * dupe edges with multiple outputs now uses first edge
+    instead of last (#867)
+  * pools actually work now
+  * generators can now run more often than twice if needed
+  * unexpected output names now cause a rebuild instead of
+    a hard error
+  * POSIX-specific changes
+   + child processes get detached from terminal
+   + check for SIGINT after ppoll/pselect -> faster Ctrl-C
+   + add an explicit SIGTERM signal handler
+  * Ran ninja under afl-fuzz and fixed all crashes and bugs it found
+   + fix crashes on cyclic graphs with multiple outputs
+   + failing stat() now aborts build
+   + cyclic rule bindings no longer crash
+   + dependency cycles with multiple outputs no longer get
+     ninja into a stuck state
+- Update ninja-disable-maxprocs-test.patch to match upstream
+  changes
+- use Python 3 for configure
+
 -------------------------------------------------------------------
 Wed Nov 26 07:42:03 UTC 2014 - idonmez@suse.com
 
diff --git a/ninja.spec b/ninja.spec
index 9774242..fc8b690 100644
--- a/ninja.spec
+++ b/ninja.spec
@@ -20,12 +20,12 @@ Name:           ninja
 Summary:        A small build system closest in spirit to Make
 License:        Apache-2.0
 Group:          Development/Tools/Building
-Version:        1.5.3
+Version:        1.6.0
 Release:        0
 Url:            https://github.com/martine/ninja
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
-BuildRequires:  python-base
+BuildRequires:  python3-base
 Source0:        https://github.com/martine/ninja/archive/v%{version}.tar.gz
 Patch1:         ninja-disable-maxprocs-test.patch
 
@@ -39,7 +39,7 @@ and orchestrates building them, quickly.
 %patch1 -p1
 
 %build
-python ./configure.py --bootstrap
+python3 ./configure.py --bootstrap
 
 %install
 mkdir -p %{buildroot}%{_bindir}
diff --git a/v1.5.3.tar.gz b/v1.5.3.tar.gz
deleted file mode 100644
index 94dc38f..0000000
--- a/v1.5.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c953b5a7c26cfcd082882e3f3e2cd08fee8848ad228bb47223b18ea18777ec0
-size 168829
diff --git a/v1.6.0.tar.gz b/v1.6.0.tar.gz
new file mode 100644
index 0000000..e690553
--- /dev/null
+++ b/v1.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7
+size 174501