diff options
| author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-04-24 16:44:38 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-26 10:09:07 +0100 |
| commit | 60ac138adc5587bd955495445c65dc73926b8eaa (patch) | |
| tree | 924e7d8daeeb8a5706ca752d57009b4a98d4222e /meta/recipes-devtools | |
| parent | d0d822d173e7662a083aed77565ca8153dd9b0b2 (diff) | |
| download | poky-60ac138adc5587bd955495445c65dc73926b8eaa.tar.gz | |
ninja: add Upstream-Status and SOB for musl patch
(From OE-Core rev: f3a20accd2372449746955fec8521ac8a55d60ed)
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')
| -rw-r--r-- | meta/recipes-devtools/ninja/ninja/fix-musl.patch | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch b/meta/recipes-devtools/ninja/ninja/fix-musl.patch index 543d4f1c48..7fd779110d 100644 --- a/meta/recipes-devtools/ninja/ninja/fix-musl.patch +++ b/meta/recipes-devtools/ninja/ninja/fix-musl.patch | |||
| @@ -1,18 +1,22 @@ | |||
| 1 | 2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001 | 1 | From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 |
| 2 | From: makepost <makepost@firemail.cc> | 2 | From: makepost <makepost@firemail.cc> |
| 3 | Date: Mon, 24 Dec 2018 03:13:16 +0200 | 3 | Date: Mon, 24 Dec 2018 03:13:16 +0200 |
| 4 | Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 | 4 | Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510 |
| 5 | 5 | ||
| 6 | In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward | 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. | 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 | ||
| 8 | --- | 12 | --- |
| 9 | src/disk_interface.cc | 14 ++++---------- | 13 | src/disk_interface.cc | 14 ++++---------- |
| 10 | 1 file changed, 4 insertions(+), 10 deletions(-) | 14 | 1 file changed, 4 insertions(+), 10 deletions(-) |
| 11 | 15 | ||
| 12 | diff --git a/src/disk_interface.cc b/src/disk_interface.cc | 16 | diff --git a/src/disk_interface.cc b/src/disk_interface.cc |
| 13 | index d4c2fb087..dc297c449 100644 | 17 | index d4c2fb0..dc297c4 100644 |
| 14 | --- src/disk_interface.cc | 18 | --- a/src/disk_interface.cc |
| 15 | +++ /src/disk_interface.cc | 19 | +++ b/src/disk_interface.cc |
| 16 | @@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { | 20 | @@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const { |
| 17 | // that it doesn't exist. | 21 | // that it doesn't exist. |
| 18 | if (st.st_mtime == 0) | 22 | if (st.st_mtime == 0) |
| @@ -37,3 +41,6 @@ index d4c2fb087..dc297c449 100644 | |||
| 37 | #else | 41 | #else |
| 38 | return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; | 42 | return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec; |
| 39 | #endif | 43 | #endif |
| 44 | -- | ||
| 45 | 2.17.1 | ||
| 46 | |||
