diff options
author | Upgrade Helper <auh@auh.yoctoproject.org> | 2020-02-21 14:45:35 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-25 10:41:22 +0000 |
commit | 8ec01ed68a87a8899726c5cd43cf18299726cc4d (patch) | |
tree | f936e3d424d78e726c55a8db903af361a4c8b0f3 /meta | |
parent | 950615f34df2e3ff3134c4d3b4b5fbc67d989214 (diff) | |
download | poky-8ec01ed68a87a8899726c5cd43cf18299726cc4d.tar.gz |
ninja: upgrade 1.9.0 -> 1.10.0
(From OE-Core rev: d1cd957cea29f3ab111ae752bc9ad75a1324c255)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/ninja/ninja_1.10.0.bb (renamed from meta/recipes-devtools/ninja/ninja_1.9.0.bb) | 6 |
2 files changed, 2 insertions, 50 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 @@ | |||
1 | From e92a915183f8bff268f74c8cd00d986301a2bbf8 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 | |||
6 | In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward | ||
7 | compatibility macro. Should help avoid hardcoding platform detection. | ||
8 | |||
9 | Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | --- | ||
13 | src/disk_interface.cc | 14 ++++---------- | ||
14 | 1 file changed, 4 insertions(+), 10 deletions(-) | ||
15 | |||
16 | diff --git a/src/disk_interface.cc b/src/disk_interface.cc | ||
17 | index 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 | -- | ||
45 | 2.17.1 | ||
46 | |||
diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb index f1236e8ac8..bdc6365052 100644 --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb | |||
@@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" | |||
5 | 5 | ||
6 | DEPENDS = "re2c-native ninja-native" | 6 | DEPENDS = "re2c-native ninja-native" |
7 | 7 | ||
8 | SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" | 8 | SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ | 10 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" |
11 | file://fix-musl.patch \ | ||
12 | " | ||
13 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" |
14 | 12 | ||
15 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |