From 8d18dccd37021ca603ef323eb8d990b30958a83824ee1422922f3bafd83794f3 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 26 Apr 2016 14:34:28 +0000 Subject: [PATCH 1/4] Accepting request 391702 from home:matz2:branches:devel:tools:building - Make it build on SLE11 (use python2 there). (It won't work in the devel:tools:building project because you broke the libtool<->m4 cycle there, but it will in other projects) OBS-URL: https://build.opensuse.org/request/show/391702 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=25 --- ninja.changes | 5 +++++ ninja.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ninja.changes b/ninja.changes index d715790..678921e 100644 --- a/ninja.changes +++ b/ninja.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 26 13:27:25 UTC 2016 - matz@suse.de + +- Make it build on SLE11 (use python2 there). + ------------------------------------------------------------------- Sat Jan 30 21:39:59 UTC 2016 - mpluskal@suse.com diff --git a/ninja.spec b/ninja.spec index 6b5288c..a93a083 100644 --- a/ninja.spec +++ b/ninja.spec @@ -26,7 +26,11 @@ Url: https://github.com/martine/ninja Source0: https://github.com/martine/ninja/archive/v%{version}.tar.gz Patch1: ninja-disable-maxprocs-test.patch BuildRequires: gcc-c++ +%if 0%{?suse_version} <= 1110 +BuildRequires: python-base +%else BuildRequires: python3-base +%endif BuildRequires: re2c BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,7 +46,11 @@ and orchestrates building them, quickly. %build export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" +%if 0%{?suse_version} <= 1110 +python ./configure.py --bootstrap --verbose +%else python3 ./configure.py --bootstrap --verbose +%endif %install mkdir -p %{buildroot}%{_bindir} From 8e36f3cfffee9679bc3021d600c311bb95d69f6450fd7051cdc95b3b61a3279e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 28 Apr 2016 07:22:29 +0000 Subject: [PATCH 2/4] Accepting request 391883 from home:mathletic:branches:devel:tools:building update to 1.7.0 OBS-URL: https://build.opensuse.org/request/show/391883 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=26 --- ninja-1.7.0.tar.gz | 3 +++ ninja-disable-maxprocs-test.patch | 12 +++++------- ninja.changes | 12 ++++++++++++ ninja.spec | 6 +++--- v1.6.0.tar.gz | 3 --- 5 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 ninja-1.7.0.tar.gz delete mode 100644 v1.6.0.tar.gz diff --git a/ninja-1.7.0.tar.gz b/ninja-1.7.0.tar.gz new file mode 100644 index 0000000..6a018a6 --- /dev/null +++ b/ninja-1.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cd5467a281c757859825c799b0cdd21926808c45b4772b718bed06617efb771 +size 179715 diff --git a/ninja-disable-maxprocs-test.patch b/ninja-disable-maxprocs-test.patch index 4b5118d..8212bb4 100644 --- a/ninja-disable-maxprocs-test.patch +++ b/ninja-disable-maxprocs-test.patch @@ -1,8 +1,6 @@ -Index: ninja-1.6.0/src/subprocess_test.cc -=================================================================== ---- ninja-1.6.0/src/subprocess_test.cc.orig -+++ ninja-1.6.0/src/subprocess_test.cc -@@ -215,38 +215,6 @@ +--- ninja-1.7.0/src/subprocess_test.cc.orig 2016-04-27 21:17:10.000000000 +0200 ++++ ninja-1.7.0/src/subprocess_test.cc 2016-04-28 07:18:42.227614370 +0200 +@@ -214,39 +214,6 @@ } } @@ -18,7 +16,8 @@ Index: ninja-1.6.0/src/subprocess_test.cc - rlimit rlim; - ASSERT_EQ(0, getrlimit(RLIMIT_NOFILE, &rlim)); - if (rlim.rlim_cur < kNumProcs) { -- printf("Raise [ulimit -n] well above %u (currently %lu) to make this test go\n", kNumProcs, rlim.rlim_cur); +- printf("Raise [ulimit -n] above %u (currently %lu) to make this test go\n", +- kNumProcs, rlim.rlim_cur); - return; - } - @@ -41,4 +40,3 @@ Index: ninja-1.6.0/src/subprocess_test.cc // 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 678921e..6dab4ef 100644 --- a/ninja.changes +++ b/ninja.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Apr 28 05:24:46 UTC 2016 - foss@grueninger.de + +- update to version 1.7.0 + * ninja now supports implicit outputs. + * Ninja's output has slightly changed, to make it easier to + automated tools to look at ninja's output. + * Ninja now explicitly handles SIGHUP and cleans up after itself. + * Ninja now uses posix_spawn instead of fork/exec to launch + subprocesses (on POSIX). +- adjust links to new wesite + ------------------------------------------------------------------- Tue Apr 26 13:27:25 UTC 2016 - matz@suse.de diff --git a/ninja.spec b/ninja.spec index a93a083..3d08f2f 100644 --- a/ninja.spec +++ b/ninja.spec @@ -17,13 +17,13 @@ Name: ninja -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: A small build system closest in spirit to Make License: Apache-2.0 Group: Development/Tools/Building -Url: https://github.com/martine/ninja -Source0: https://github.com/martine/ninja/archive/v%{version}.tar.gz +Url: https://ninja-build.org/ +Source0: https://github.com/ninja-build/ninja/archive/%{name}-%{version}.tar.gz Patch1: ninja-disable-maxprocs-test.patch BuildRequires: gcc-c++ %if 0%{?suse_version} <= 1110 diff --git a/v1.6.0.tar.gz b/v1.6.0.tar.gz deleted file mode 100644 index e690553..0000000 --- a/v1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7 -size 174501 From a1623ab1f73b02875f93f0cc0bc83f32c897c0aefb5839f93ed7b844dfd9ecf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 28 Apr 2016 07:27:15 +0000 Subject: [PATCH 3/4] - OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=27 --- ninja.spec | 2 +- ninja-1.7.0.tar.gz => v1.7.0.tar.gz | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename ninja-1.7.0.tar.gz => v1.7.0.tar.gz (100%) diff --git a/ninja.spec b/ninja.spec index 3d08f2f..f9dfb8d 100644 --- a/ninja.spec +++ b/ninja.spec @@ -23,7 +23,7 @@ Summary: A small build system closest in spirit to Make License: Apache-2.0 Group: Development/Tools/Building Url: https://ninja-build.org/ -Source0: https://github.com/ninja-build/ninja/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/ninja-build/ninja/archive/v%{version}.tar.gz Patch1: ninja-disable-maxprocs-test.patch BuildRequires: gcc-c++ %if 0%{?suse_version} <= 1110 diff --git a/ninja-1.7.0.tar.gz b/v1.7.0.tar.gz similarity index 100% rename from ninja-1.7.0.tar.gz rename to v1.7.0.tar.gz From f48823c0ced711d83cade9ee1d2c36af770cb1d73878fb9e21e102d93c943524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 29 Apr 2016 17:45:46 +0000 Subject: [PATCH 4/4] - Update to version 1.7.1 * Change default NINJA_STATUS to [%f/%t] github issue #1143 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=28 --- ninja.changes | 6 ++++++ ninja.spec | 2 +- v1.7.0.tar.gz | 3 --- v1.7.1.tar.gz | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 v1.7.0.tar.gz create mode 100644 v1.7.1.tar.gz diff --git a/ninja.changes b/ninja.changes index 6dab4ef..0fd0e73 100644 --- a/ninja.changes +++ b/ninja.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 29 17:34:13 UTC 2016 - idonmez@suse.com + +- Update to version 1.7.1 + * Change default NINJA_STATUS to [%f/%t] github issue #1143 + ------------------------------------------------------------------- Thu Apr 28 05:24:46 UTC 2016 - foss@grueninger.de diff --git a/ninja.spec b/ninja.spec index f9dfb8d..3f5bae9 100644 --- a/ninja.spec +++ b/ninja.spec @@ -17,7 +17,7 @@ Name: ninja -Version: 1.7.0 +Version: 1.7.1 Release: 0 Summary: A small build system closest in spirit to Make License: Apache-2.0 diff --git a/v1.7.0.tar.gz b/v1.7.0.tar.gz deleted file mode 100644 index 6a018a6..0000000 --- a/v1.7.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cd5467a281c757859825c799b0cdd21926808c45b4772b718bed06617efb771 -size 179715 diff --git a/v1.7.1.tar.gz b/v1.7.1.tar.gz new file mode 100644 index 0000000..e26f043 --- /dev/null +++ b/v1.7.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51581de53cf4705b89eb6b14a85baa73288ad08bff256e7d30d529155813be19 +size 179717