From 1c4e99cc4e645d854d0f6e43b14938686837c8ae Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 4 Feb 2020 00:31:23 -0800 Subject: [PATCH 1/2] ninja: updated to 1.10.0 Removed upstreamed patches. Signed-off-by: Rosen Penev --- devel/ninja/Makefile | 4 +-- devel/ninja/patches/010-musl.patch | 37 ---------------------------- devel/ninja/patches/020-uclibc.patch | 30 ---------------------- 3 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 devel/ninja/patches/010-musl.patch delete mode 100644 devel/ninja/patches/020-uclibc.patch diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile index 309ce800f..aa20fd910 100644 --- a/devel/ninja/Makefile +++ b/devel/ninja/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ninja -PKG_VERSION:=1.9.0 +PKG_VERSION:=1.10.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ninja-build/ninja/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9 +PKG_HASH:=3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f PKG_MAINTAINER:=Andre Heider PKG_LICENSE:=Apache-2.0 diff --git a/devel/ninja/patches/010-musl.patch b/devel/ninja/patches/010-musl.patch deleted file mode 100644 index 6c4426fa4..000000000 --- a/devel/ninja/patches/010-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 567815df38a2ff54ad7478a90bd75c91e434236a 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. ---- - src/disk_interface.cc | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - ---- a/src/disk_interface.cc -+++ b/src/disk_interface.cc -@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(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/devel/ninja/patches/020-uclibc.patch b/devel/ninja/patches/020-uclibc.patch deleted file mode 100644 index 5637e65d7..000000000 --- a/devel/ninja/patches/020-uclibc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 76abf78aac8c56606fb52ea874873d790b9044da Mon Sep 17 00:00:00 2001 -From: "Pawel Hajdan, Jr" -Date: Mon, 2 Jan 2017 10:42:35 +0000 -Subject: [PATCH] Fix build with uclibc - -Resolves #985 - -This is based on musl implementation, -http://git.musl-libc.org/cgit/musl/commit/?id=20cbd607759038dca57f84ef7e7b5d44a3088574 -(thanks to jbergstroem@ for reference) ---- - src/util.cc | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/src/util.cc -+++ b/src/util.cc -@@ -572,6 +572,13 @@ double GetLoadAverage() { - return -0.0f; - return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0]; - } -+#elif defined(__UCLIBC__) -+double GetLoadAverage() { -+ struct sysinfo si; -+ if (sysinfo(&si) != 0) -+ return -0.0f; -+ return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0]; -+} - #else - double GetLoadAverage() { - double loadavg[3] = { 0.0f, 0.0f, 0.0f }; From 66bf801f3a6ff15db31eb689324917ec2cd312ec Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 5 Feb 2020 02:31:05 -0800 Subject: [PATCH 2/2] meson: update to 0.53.1 Signed-off-by: Rosen Penev --- devel/meson/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 989e8103b..c6eacda98 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=meson -PKG_VERSION:=0.52.1 +PKG_VERSION:=0.53.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/mesonbuild/meson/releases/download/$(PKG_VERSION)/ -PKG_HASH:=0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035 +PKG_HASH:=ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04 PKG_MAINTAINER:=Andre Heider PKG_LICENSE:=Apache-2.0