gnu: ninja: Update to 1.7.1.
* gnu/packages/ninja.scm (ninja): Update to 1.7.1. * gnu/packages/patches/ninja-tests.patch: Update patch.
This commit is contained in:
parent
fa6a082ea8
commit
dbd6bc5cc6
|
@ -1,6 +1,7 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||||
|
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -28,7 +29,7 @@
|
||||||
(define-public ninja
|
(define-public ninja
|
||||||
(package
|
(package
|
||||||
(name "ninja")
|
(name "ninja")
|
||||||
(version "1.5.3")
|
(version "1.7.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://github.com/martine/ninja/"
|
(uri (string-append "https://github.com/martine/ninja/"
|
||||||
|
@ -36,7 +37,7 @@
|
||||||
(file-name (string-append name "-" version ".tar.gz"))
|
(file-name (string-append name "-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw"))
|
"06dy2dc1aafm61ynw9gzig88la3km9dsh53bxf4mnw7l7kjisn2i"))
|
||||||
(patches (search-patches "ninja-zero-mtime.patch"
|
(patches (search-patches "ninja-zero-mtime.patch"
|
||||||
"ninja-tests.patch"))))
|
"ninja-tests.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
|
@ -69,7 +70,7 @@
|
||||||
(install-file "ninja" bin)
|
(install-file "ninja" bin)
|
||||||
(install-file "doc/manual.asciidoc" doc)
|
(install-file "doc/manual.asciidoc" doc)
|
||||||
#t))))))
|
#t))))))
|
||||||
(home-page "http://martine.github.io/ninja/")
|
(home-page "https://ninja-build.org/")
|
||||||
(synopsis "Small build system")
|
(synopsis "Small build system")
|
||||||
(description
|
(description
|
||||||
"Ninja is a small build system with a focus on speed. It differs from
|
"Ninja is a small build system with a focus on speed. It differs from
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
SubprocessTest.SetWithLots fails with:
|
From 67d6b9262efad99f8aad63ab81efc8e689748766 Mon Sep 17 00:00:00 2001
|
||||||
Raise [ulimit -n] well above 1025 to make this test go.
|
From: Efraim Flashner <efraim@flashner.co.il>
|
||||||
Skip it.
|
Date: Sun, 3 Jul 2016 11:55:43 +0300
|
||||||
|
Subject: [PATCH] patch
|
||||||
|
|
||||||
SubprocessTest.InterruptChild fails when using 'system*':
|
---
|
||||||
*** Failure in src/subprocess_test.cc:83
|
src/subprocess_test.cc | 4 ++++
|
||||||
ExitInterrupted == subproc->Finish()
|
1 file changed, 4 insertions(+)
|
||||||
I can pass it by using 'system' instead of 'system*' when building locally,
|
|
||||||
but it still failed on Hydra. Skip it.
|
|
||||||
|
|
||||||
--- ninja-1.5.3.orig/src/subprocess_test.cc 2015-01-15 10:34:28.859522176 +0800
|
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
|
||||||
+++ ninja-1.5.3/src/subprocess_test.cc 2015-01-15 10:37:52.969572075 +0800
|
index ee16190..a537c11 100644
|
||||||
@@ -72,6 +72,7 @@
|
--- a/src/subprocess_test.cc
|
||||||
|
+++ b/src/subprocess_test.cc
|
||||||
|
@@ -72,6 +72,7 @@ TEST_F(SubprocessTest, NoSuchCommand) {
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
|
||||||
|
@ -18,7 +19,7 @@ but it still failed on Hydra. Skip it.
|
||||||
TEST_F(SubprocessTest, InterruptChild) {
|
TEST_F(SubprocessTest, InterruptChild) {
|
||||||
Subprocess* subproc = subprocs_.Add("kill -INT $$");
|
Subprocess* subproc = subprocs_.Add("kill -INT $$");
|
||||||
ASSERT_NE((Subprocess *) 0, subproc);
|
ASSERT_NE((Subprocess *) 0, subproc);
|
||||||
@@ -82,6 +83,7 @@
|
@@ -82,6 +83,7 @@ TEST_F(SubprocessTest, InterruptChild) {
|
||||||
|
|
||||||
EXPECT_EQ(ExitInterrupted, subproc->Finish());
|
EXPECT_EQ(ExitInterrupted, subproc->Finish());
|
||||||
}
|
}
|
||||||
|
@ -26,7 +27,7 @@ but it still failed on Hydra. Skip it.
|
||||||
|
|
||||||
TEST_F(SubprocessTest, InterruptParent) {
|
TEST_F(SubprocessTest, InterruptParent) {
|
||||||
Subprocess* subproc = subprocs_.Add("kill -INT $PPID ; sleep 1");
|
Subprocess* subproc = subprocs_.Add("kill -INT $PPID ; sleep 1");
|
||||||
@@ -169,6 +171,7 @@
|
@@ -217,6 +219,7 @@ TEST_F(SubprocessTest, SetWithMulti) {
|
||||||
// OS X's process limit is less than 1025 by default
|
// 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).
|
// (|sysctl kern.maxprocperuid| is 709 on 10.7 and 10.8 and less prior to that).
|
||||||
#if !defined(__APPLE__) && !defined(_WIN32)
|
#if !defined(__APPLE__) && !defined(_WIN32)
|
||||||
|
@ -34,11 +35,14 @@ but it still failed on Hydra. Skip it.
|
||||||
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.
|
||||||
@@ -196,6 +199,7 @@
|
@@ -245,6 +248,7 @@ TEST_F(SubprocessTest, SetWithLots) {
|
||||||
}
|
}
|
||||||
ASSERT_EQ(kNumProcs, subprocs_.finished_.size());
|
ASSERT_EQ(kNumProcs, subprocs_.finished_.size());
|
||||||
}
|
}
|
||||||
+#endif
|
+#endif
|
||||||
#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
|
||||||
|
--
|
||||||
|
2.9.0
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue