Mercurial > vanilla

annotate dev/ninja/musl.patch @ 1019:ddab65a5b3f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: use /bin/busybox sh as default shell
author David Demelier <markand@malikania.fr>
date Thu, 29 Aug 2019 23:35:00 +0200
parents d4ef88a663b2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
213
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 From: makepost <makepost@firemail.cc>
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 Date: Mon, 24 Dec 2018 03:13:16 +0200
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
5
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 compatibility macro. Should help avoid hardcoding platform detection.
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 ---
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 src/disk_interface.cc | 14 ++++----------
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 1 file changed, 4 insertions(+), 10 deletions(-)
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
11
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 diff --git a/src/disk_interface.cc b/src/disk_interface.cc
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 index d4c2fb087..dc297c449 100644
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 --- src/disk_interface.cc
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 +++ /src/disk_interface.cc
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 @@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 // that it doesn't exist.
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 if (st.st_mtime == 0)
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 return 1;
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 -#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE)
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 +#if defined(_AIX)
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 + return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 +#elif defined(__APPLE__)
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL +
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 st.st_mtimespec.tv_nsec);
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 -#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 - defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__))
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 - // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 - // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above.
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 - // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 - // For bionic, C and POSIX API is always enabled.
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 - // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html.
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 +#elif defined(st_mtime) // A macro, so we're likely on modern POSIX.
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec;
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 -#elif defined(_AIX)
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 - return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 #else
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec;
d4ef88a663b2 dev/ninja: initial import, closes #1089
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 #endif