ninja: update to 1.9.0.
This commit is contained in:
parent
25f0d95800
commit
00ac41cfe5
|
@ -0,0 +1,39 @@
|
|||
2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001
|
||||
From: makepost <makepost@firemail.cc>
|
||||
Date: Mon, 24 Dec 2018 03:13:16 +0200
|
||||
Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510
|
||||
|
||||
In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward
|
||||
compatibility macro. Should help avoid hardcoding platform detection.
|
||||
---
|
||||
src/disk_interface.cc | 14 ++++----------
|
||||
1 file changed, 4 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/disk_interface.cc b/src/disk_interface.cc
|
||||
index d4c2fb087..dc297c449 100644
|
||||
--- src/disk_interface.cc
|
||||
+++ /src/disk_interface.cc
|
||||
@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
|
||||
// that it doesn't exist.
|
||||
if (st.st_mtime == 0)
|
||||
return 1;
|
||||
-#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE)
|
||||
+#if defined(_AIX)
|
||||
+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
|
||||
+#elif defined(__APPLE__)
|
||||
return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL +
|
||||
st.st_mtimespec.tv_nsec);
|
||||
-#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
|
||||
- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__))
|
||||
- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html
|
||||
- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above.
|
||||
- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar
|
||||
- // For bionic, C and POSIX API is always enabled.
|
||||
- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html.
|
||||
+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX.
|
||||
return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec;
|
||||
-#elif defined(_AIX)
|
||||
- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
|
||||
#else
|
||||
return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec;
|
||||
#endif
|
|
@ -1,20 +1,21 @@
|
|||
# Template file for 'ninja'
|
||||
pkgname=ninja
|
||||
version=1.8.2
|
||||
version=1.9.0
|
||||
revision=1
|
||||
hostmakedepends="python asciidoc"
|
||||
short_desc="Small build system with a focus on speed"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.org>"
|
||||
maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
||||
license="Apache-2.0"
|
||||
homepage="https://ninja-build.org/"
|
||||
distfiles="https://github.com/martine/ninja/archive/v${version}.tar.gz"
|
||||
checksum=86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4
|
||||
checksum=5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9
|
||||
|
||||
do_configure() {
|
||||
# Skip rebuild with bootstrapped ninja until build phase:
|
||||
sed -e "s|subprocess.check_call(rebuild_args)|pass|" -i configure.py
|
||||
vsed -e "s|subprocess.check_call(rebuild_args)|pass|" -i configure.py
|
||||
python2 configure.py --bootstrap
|
||||
}
|
||||
|
||||
do_build() {
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
HOST_CXXFLAGS="${BUILD_CFLAGS}"
|
||||
|
@ -24,10 +25,12 @@ do_build() {
|
|||
CXXFLAGS="$HOST_CXXFLAGS" python2 configure.py
|
||||
asciidoc doc/manual.asciidoc
|
||||
}
|
||||
|
||||
do_check() {
|
||||
./ninja ninja_test &&
|
||||
./ninja_test --gtest_filter=-SubprocessTest.SetWithLots
|
||||
}
|
||||
|
||||
do_install() {
|
||||
vbin ninja
|
||||
vdoc doc/manual.html
|
||||
|
|
Loading…
Reference in New Issue