summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ninja/ninja/fix-musl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/ninja/ninja/fix-musl.patch')
-rw-r--r--meta/recipes-devtools/ninja/ninja/fix-musl.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch
deleted file mode 100644
index 7fd779110d..0000000000
--- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001
2From: makepost <makepost@firemail.cc>
3Date: Mon, 24 Dec 2018 03:13:16 +0200
4Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510
5
6In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward
7compatibility macro. Should help avoid hardcoding platform detection.
8
9Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
10
11Upstream-Status: Pending
12---
13 src/disk_interface.cc | 14 ++++----------
14 1 file changed, 4 insertions(+), 10 deletions(-)
15
16diff --git a/src/disk_interface.cc b/src/disk_interface.cc
17index d4c2fb0..dc297c4 100644
18--- a/src/disk_interface.cc
19+++ b/src/disk_interface.cc
20@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
21 // that it doesn't exist.
22 if (st.st_mtime == 0)
23 return 1;
24-#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE)
25+#if defined(_AIX)
26+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
27+#elif defined(__APPLE__)
28 return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL +
29 st.st_mtimespec.tv_nsec);
30-#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
31- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__))
32- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html
33- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above.
34- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar
35- // For bionic, C and POSIX API is always enabled.
36- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html.
37+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX.
38 return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec;
39-#elif defined(_AIX)
40- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
41 #else
42 return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec;
43 #endif
44--
452.17.1
46