diff options
| author |   Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-03-23 17:40:10 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-25 11:56:52 +0000 |
| commit | a72b970b7fec9bea45583223e5f95bba385fa0d3 (patch) | |
| tree | 0fc246f1452a53e0ecd8a60999751de2005ccd14 /meta/recipes-devtools/ninja | |
| parent | 3efbde7738efd3b69f86d4cb4b08e4e11190f75d (diff) | |
| download | openembedded-core-contrib-a72b970b7fec9bea45583223e5f95bba385fa0d3.tar.gz | |
ninja: update to 1.9.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ninja')
| -rw-r--r-- | meta/recipes-devtools/ninja/ninja/fix-musl.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-devtools/ninja/ninja_1.9.0.bb (renamed from meta/recipes-devtools/ninja/ninja_1.8.2.bb) | 6 |
2 files changed, 43 insertions, 2 deletions
diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch new file mode 100644 index 00000000000..543d4f1c48f --- /dev/null +++ b/meta/recipes-devtools/ninja/ninja/fix-musl.patch @@ -0,0 +1,39 @@ +2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001 +From: makepost <makepost@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 +--- 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/meta/recipes-devtools/ninja/ninja_1.8.2.bb b/meta/recipes-devtools/ninja/ninja_1.9.0.bb index c6fcfef3dd8..1b063289614 100644 --- a/meta/recipes-devtools/ninja/ninja_1.8.2.bb +++ b/meta/recipes-devtools/ninja/ninja_1.9.0.bb @@ -5,9 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" DEPENDS = "re2c-native ninja-native" -SRCREV = "253e94c1fa511704baeb61cf69995bbf09ba435e" +SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ + file://fix-musl.patch \ +" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" S = "${WORKDIR}/git" |