From 47c25d3c5b7bdb4f7da98ce661b29cfdf9e69528 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 3 Feb 2020 23:05:39 +0100 Subject: [PATCH] ninja: update to 1.10.0. --- srcpkgs/ninja/patches/fix-musl.patch | 39 ---------------------------- srcpkgs/ninja/template | 6 ++--- 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/ninja/patches/fix-musl.patch diff --git a/srcpkgs/ninja/patches/fix-musl.patch b/srcpkgs/ninja/patches/fix-musl.patch deleted file mode 100644 index 543d4f1c48f..00000000000 --- a/srcpkgs/ninja/patches/fix-musl.patch +++ /dev/null @@ -1,39 +0,0 @@ -2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001 -From: makepost -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 diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template index 056f59ff57c..66260c02b01 100644 --- a/srcpkgs/ninja/template +++ b/srcpkgs/ninja/template @@ -1,14 +1,14 @@ # Template file for 'ninja' pkgname=ninja -version=1.9.0 +version=1.10.0 revision=1 hostmakedepends="python asciidoc" short_desc="Small build system with a focus on speed" -maintainer="Orphaned " +maintainer="Duncaen " license="Apache-2.0" homepage="https://ninja-build.org/" distfiles="https://github.com/martine/ninja/archive/v${version}.tar.gz" -checksum=5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9 +checksum=3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f do_configure() { # Skip rebuild with bootstrapped ninja until build phase: