diff --git a/ninja-1.7.2.tar.gz b/ninja-1.7.2.tar.gz new file mode 100644 index 0000000..a213232 --- /dev/null +++ b/ninja-1.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9 +size 180611 diff --git a/ninja-disable-maxprocs-test.patch b/ninja-disable-maxprocs-test.patch index 8212bb4..9a4be9c 100644 --- a/ninja-disable-maxprocs-test.patch +++ b/ninja-disable-maxprocs-test.patch @@ -1,12 +1,12 @@ ---- 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 @@ +Index: src/subprocess_test.cc +=================================================================== +--- src/subprocess_test.cc.orig ++++ src/subprocess_test.cc +@@ -214,36 +214,6 @@ TEST_F(SubprocessTest, SetWithMulti) { } } --// OS X's process limit is less than 1025 by default --// (|sysctl kern.maxprocperuid| is 709 on 10.7 and 10.8 and less prior to that). --#if !defined(__APPLE__) && !defined(_WIN32) +-#if defined(USE_PPOLL) -TEST_F(SubprocessTest, SetWithLots) { - // Arbitrary big number; needs to be over 1024 to confirm we're no longer - // hostage to pselect. @@ -36,7 +36,6 @@ - ASSERT_EQ(kNumProcs, subprocs_.finished_.size()); -} -#endif // !__APPLE__ && !_WIN32 -- + // TODO: this test could work on Windows, just not sure how to simply // read stdin. - #ifndef _WIN32 diff --git a/ninja.changes b/ninja.changes index 0fd0e73..88503f6 100644 --- a/ninja.changes +++ b/ninja.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Nov 13 11:08:00 UTC 2016 - mpluskal@suse.com + +- Update to version 1.7.2: + * %e and %r work again in dumb terminals (#1146, #1148) + * `-t browse` now HTML-escapes rule names (#1157) + * an edge may now have 0 explicit outputs if it has implicit + outputs (#1159) + * make misc/measure.py python 3-compatible + * misc/write_fake_manifest.py now optionally writes source files, + use it to quickly produce large, buildable projects for testing + (#1109, #1198) + * on newer FreeBSDs, use ppoll() +- Refresh ninja-disable-maxprocs-test.patch + ------------------------------------------------------------------- Fri Apr 29 17:34:13 UTC 2016 - idonmez@suse.com diff --git a/ninja.spec b/ninja.spec index 3f5bae9..066c7a3 100644 --- a/ninja.spec +++ b/ninja.spec @@ -17,13 +17,13 @@ Name: ninja -Version: 1.7.1 +Version: 1.7.2 Release: 0 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/v%{version}.tar.gz +Source0: https://github.com/ninja-build/ninja/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch1: ninja-disable-maxprocs-test.patch BuildRequires: gcc-c++ %if 0%{?suse_version} <= 1110 @@ -41,24 +41,22 @@ and orchestrates building them, quickly. %prep %setup -q -%patch1 -p1 +%patch1 %build export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" %if 0%{?suse_version} <= 1110 -python ./configure.py --bootstrap --verbose +python2./configure.py --bootstrap --verbose %else python3 ./configure.py --bootstrap --verbose %endif %install -mkdir -p %{buildroot}%{_bindir} - -install -D -m 0755 ninja %{buildroot}%{_bindir}/ninja -install -D -m 0644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja -install -D -m 0644 misc/ninja.vim %{buildroot}%{_datadir}/vim/site/syntax/ninja.vim -install -D -m 0644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/ninja +install -D -p -m 0755 ninja %{buildroot}%{_bindir}/ninja +install -D -p -m 0644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja +install -D -p -m 0644 misc/ninja.vim %{buildroot}%{_datadir}/vim/site/syntax/ninja.vim +install -D -p -m 0644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/ninja %check ./ninja ninja_test diff --git a/v1.7.1.tar.gz b/v1.7.1.tar.gz deleted file mode 100644 index e26f043..0000000 --- a/v1.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51581de53cf4705b89eb6b14a85baa73288ad08bff256e7d30d529155813be19 -size 179717