commit: b6ab66e96f36dd162edf26463d9fa93c2f3f131e Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Apr 3 19:49:49 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Apr 3 19:49:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ab66e9
dev-util/ninja: fix build on bsd/musl Closes: https://bugs.gentoo.org/663216 Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-util/ninja/files/ninja-1.9.0-musl.patch | 39 +++++++++++++++++++++++++++++ dev-util/ninja/ninja-1.9.0.ebuild | 6 ++++- dev-util/ninja/ninja-9999.ebuild | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dev-util/ninja/files/ninja-1.9.0-musl.patch b/dev-util/ninja/files/ninja-1.9.0-musl.patch new file mode 100644 index 00000000000..f6aeb428974 --- /dev/null +++ b/dev-util/ninja/files/ninja-1.9.0-musl.patch @@ -0,0 +1,39 @@ +From 567815df38a2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001 +From: makepost <makep...@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 +--- a/src/disk_interface.cc ++++ b/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/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild index 8eb95d5047f..4bc01a90da3 100644 --- a/dev-util/ninja/ninja-1.9.0.ebuild +++ b/dev-util/ninja/ninja-1.9.0.ebuild @@ -44,7 +44,11 @@ RDEPEND=" app-editors/gvim ) ) - !<net-irc/ninja-1.5.9_pre14-r1" #436804 +" + +PATCHES=( + "${FILESDIR}/ninja-1.9.0-musl.patch" +) run_for_build() { if tc-is-cross-compiler; then diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild index 8eb95d5047f..bd7bd0ad6ed 100644 --- a/dev-util/ninja/ninja-9999.ebuild +++ b/dev-util/ninja/ninja-9999.ebuild @@ -44,7 +44,7 @@ RDEPEND=" app-editors/gvim ) ) - !<net-irc/ninja-1.5.9_pre14-r1" #436804 +" run_for_build() { if tc-is-cross-compiler; then
