[gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/files/

[Aaron Bauman]

commit:     13cdef93017ab33bd801fd0596bf94ea90ffbf74
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Mar  5 16:58:11 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 04:46:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cdef93

dev-util/ninja: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11274
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-util/ninja/files/ninja-uclibc.patch | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/dev-util/ninja/files/ninja-uclibc.patch b/dev-util/ninja/files/ninja-uclibc.patch
deleted file mode 100644
index e87eea84272..00000000000
--- a/dev-util/ninja/files/ninja-uclibc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/util.cc b/src/util.cc
-index e31fd1f..1caa1ce 100644
---- a/src/util.cc
-+++ b/src/util.cc
-@@ -585,6 +585,13 @@ double GetLoadAverage() {
-   // Calculation taken from comment in libperfstats.h
-   return double(cpu_stats.loadavg[0]) / double(1 << SBITS);
- }
-+#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 };

[gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/files/

[Stephan Hartmann]

commit:     9c53acc9eed1a369f3d3212c6eec257a3a2786bf
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Nov 16 07:59:39 2020 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 14:59:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c53acc9

dev-util/ninja: remove unused patch

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18275
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 dev-util/ninja/files/ninja-1.9.0-musl.patch | 39 -----------------------------
 1 file changed, 39 deletions(-)

diff --git a/dev-util/ninja/files/ninja-1.9.0-musl.patch b/dev-util/ninja/files/ninja-1.9.0-musl.patch
deleted file mode 100644
index f6aeb428974..00000000000
--- a/dev-util/ninja/files/ninja-1.9.0-musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 567815df38a2ff54ad7478a90bd75c91e434236a 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
---- 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

[gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/files/

[Stephan Hartmann]

commit:     571aadbc869cb5269936dfb256a11b7f6abe7068
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 10:52:03 2022 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 10:52:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571aadbc

dev-util/ninja: remove unused patch

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 dev-util/ninja/files/ninja-1.10.0-readme.patch | 38 --------------------------
 1 file changed, 38 deletions(-)

diff --git a/dev-util/ninja/files/ninja-1.10.0-readme.patch b/dev-util/ninja/files/ninja-1.10.0-readme.patch
deleted file mode 100644
index 1d84f123daf0..000000000000
--- a/dev-util/ninja/files/ninja-1.10.0-readme.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b748d085618bf5e802de6a13b07d632d20ab04bf Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 20 Mar 2020 19:36:01 -0400
-Subject: [PATCH] Replace references to README with README.md
-
-The README file was renamed to README.md in commit
-a37da20ae74c81703b1c811182fc154d95ed46fe.
----
- configure.py              | 2 +-
- misc/packaging/ninja.spec | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.py b/configure.py
-index 7d8ce9045..8eef7e6eb 100755
---- a/configure.py
-+++ b/configure.py
-@@ -649,7 +649,7 @@ def has_re2c():
-        command='$doxygen_mainpage_generator $in > $out',
-        description='DOXYGEN_MAINPAGE $out')
- mainpage = n.build(built('doxygen_mainpage'), 'doxygen_mainpage',
--                   ['README', 'COPYING'],
-+                   ['README.md', 'COPYING'],
-                    implicit=['$doxygen_mainpage_generator'])
- n.build('doxygen', 'doxygen', doc('doxygen.config'),
-         implicit=mainpage)
-diff --git a/misc/packaging/ninja.spec b/misc/packaging/ninja.spec
-index 05f5a079a..36e518186 100644
---- a/misc/packaging/ninja.spec
-+++ b/misc/packaging/ninja.spec
-@@ -32,7 +32,7 @@ cp -p ninja %{buildroot}%{_bindir}/
- 
- %files
- %defattr(-, root, root)
--%doc COPYING README doc/manual.html
-+%doc COPYING README.md doc/manual.html
- %{_bindir}/*
- 
- %clean