Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (df82d907ca2966beb148b38adf520abeb9ec9b44)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (df82d907ca2966beb148b38adf520abeb9ec9b44)
  • Date: Mon, 20 May 2019 21:35:39 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/ninja-build-system/HISTORY | 3 +
devel/ninja-build-system/PRE_BUILD | 3 +
devel/ninja-build-system/musl-fixes.patch | 46
++++++++++++++++++++++++++++++
3 files changed, 52 insertions(+)

New commits:
commit df82d907ca2966beb148b38adf520abeb9ec9b44
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ninja-build-system: Fix build against musl

diff --git a/devel/ninja-build-system/HISTORY
b/devel/ninja-build-system/HISTORY
index 833ce1c..a343aa4 100644
--- a/devel/ninja-build-system/HISTORY
+++ b/devel/ninja-build-system/HISTORY
@@ -1,3 +1,6 @@
+2019-05-20 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, musl-fixes.patch: Fixed build against musl
+
2019-02-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.9.0

diff --git a/devel/ninja-build-system/PRE_BUILD
b/devel/ninja-build-system/PRE_BUILD
new file mode 100755
index 0000000..709e60d
--- /dev/null
+++ b/devel/ninja-build-system/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -fp1 -i "$SPELL_DIRECTORY/musl-fixes.patch"
diff --git a/devel/ninja-build-system/musl-fixes.patch
b/devel/ninja-build-system/musl-fixes.patch
new file mode 100644
index 0000000..7fd7791
--- /dev/null
+++ b/devel/ninja-build-system/musl-fixes.patch
@@ -0,0 +1,46 @@
+From e92a915183f8bff268f74c8cd00d986301a2bbf8 Mon Sep 17 00:00:00 2001
+From: makepost <makepost AT 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.
+
+Signed-off-by: Oleksandr Kravchuk <open.source AT oleksandr-kravchuk.com>
+
+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
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (df82d907ca2966beb148b38adf520abeb9ec9b44), Ismael Luceno, 05/20/2019

Archive powered by MHonArc 2.6.24.

Top of Page