SHA256
1
0
forked from pool/ninja

- 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

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=30
This commit is contained in:
Martin Pluskal 2016-11-13 11:22:15 +00:00 committed by Git OBS Bridge
parent f48823c0ce
commit 94dd2c0e8d
5 changed files with 33 additions and 21 deletions

3
ninja-1.7.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9
size 180611

View File

@ -1,12 +1,12 @@
--- ninja-1.7.0/src/subprocess_test.cc.orig 2016-04-27 21:17:10.000000000 +0200 Index: src/subprocess_test.cc
+++ ninja-1.7.0/src/subprocess_test.cc 2016-04-28 07:18:42.227614370 +0200 ===================================================================
@@ -214,39 +214,6 @@ --- 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 -#if defined(USE_PPOLL)
-// (|sysctl kern.maxprocperuid| is 709 on 10.7 and 10.8 and less prior to that).
-#if !defined(__APPLE__) && !defined(_WIN32)
-TEST_F(SubprocessTest, SetWithLots) { -TEST_F(SubprocessTest, SetWithLots) {
- // Arbitrary big number; needs to be over 1024 to confirm we're no longer - // Arbitrary big number; needs to be over 1024 to confirm we're no longer
- // hostage to pselect. - // hostage to pselect.
@ -36,7 +36,6 @@
- ASSERT_EQ(kNumProcs, subprocs_.finished_.size()); - 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 // TODO: this test could work on Windows, just not sure how to simply
// read stdin. // read stdin.
#ifndef _WIN32

View File

@ -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 Fri Apr 29 17:34:13 UTC 2016 - idonmez@suse.com

View File

@ -17,13 +17,13 @@
Name: ninja Name: ninja
Version: 1.7.1 Version: 1.7.2
Release: 0 Release: 0
Summary: A small build system closest in spirit to Make Summary: A small build system closest in spirit to Make
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
Url: https://ninja-build.org/ 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 Patch1: ninja-disable-maxprocs-test.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%if 0%{?suse_version} <= 1110 %if 0%{?suse_version} <= 1110
@ -41,24 +41,22 @@ and orchestrates building them, quickly.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}" export CXXFLAGS="%{optflags}"
%if 0%{?suse_version} <= 1110 %if 0%{?suse_version} <= 1110
python ./configure.py --bootstrap --verbose python2./configure.py --bootstrap --verbose
%else %else
python3 ./configure.py --bootstrap --verbose python3 ./configure.py --bootstrap --verbose
%endif %endif
%install %install
mkdir -p %{buildroot}%{_bindir} 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 -m 0755 ninja %{buildroot}%{_bindir}/ninja install -D -p -m 0644 misc/ninja.vim %{buildroot}%{_datadir}/vim/site/syntax/ninja.vim
install -D -m 0644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja install -D -p -m 0644 misc/bash-completion %{buildroot}%{_sysconfdir}/bash_completion.d/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
%check %check
./ninja ninja_test ./ninja ninja_test

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:51581de53cf4705b89eb6b14a85baa73288ad08bff256e7d30d529155813be19
size 179717