From d1cd957cea29f3ab111ae752bc9ad75a1324c255 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Fri, 21 Feb 2020 14:45:35 -0800 Subject: ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ninja/ninja/fix-musl.patch | 46 ------------------------ meta/recipes-devtools/ninja/ninja_1.10.0.bb | 30 ++++++++++++++++ meta/recipes-devtools/ninja/ninja_1.9.0.bb | 32 ----------------- 3 files changed, 30 insertions(+), 78 deletions(-) delete mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch create mode 100644 meta/recipes-devtools/ninja/ninja_1.10.0.bb delete mode 100644 meta/recipes-devtools/ninja/ninja_1.9.0.bb 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 @@ -From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001 -From: makepost -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. - -Signed-off-by: Oleksandr Kravchuk - -Upstream-Status: Pending ---- - 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 d4c2fb0..dc297c4 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 --- -2.17.1 - diff --git a/meta/recipes-devtools/ninja/ninja_1.10.0.bb b/meta/recipes-devtools/ninja/ninja_1.10.0.bb new file mode 100644 index 0000000000..bdc6365052 --- /dev/null +++ b/meta/recipes-devtools/ninja/ninja_1.10.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "Ninja is a small build system with a focus on speed." +HOMEPAGE = "http://martine.github.com/ninja/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" + +DEPENDS = "re2c-native ninja-native" + +SRCREV = "ed7f67040b370189d989adbd60ff8ea29957231f" + +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" + +S = "${WORKDIR}/git" + +do_configure[noexec] = "1" + +do_compile_class-native() { + python3 ./configure.py --bootstrap +} + +do_compile() { + python3 ./configure.py + ninja +} + +do_install() { + install -D -m 0755 ${S}/ninja ${D}${bindir}/ninja +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/ninja/ninja_1.9.0.bb b/meta/recipes-devtools/ninja/ninja_1.9.0.bb deleted file mode 100644 index f1236e8ac8..0000000000 --- a/meta/recipes-devtools/ninja/ninja_1.9.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Ninja is a small build system with a focus on speed." -HOMEPAGE = "http://martine.github.com/ninja/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" - -DEPENDS = "re2c-native ninja-native" - -SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc" - -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \ - file://fix-musl.patch \ -" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P.*)" - -S = "${WORKDIR}/git" - -do_configure[noexec] = "1" - -do_compile_class-native() { - python3 ./configure.py --bootstrap -} - -do_compile() { - python3 ./configure.py - ninja -} - -do_install() { - install -D -m 0755 ${S}/ninja ${D}${bindir}/ninja -} - -BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg