fix-musl.patch 1.9 KB

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