mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
ninja: bump version.
This commit is contained in:
@@ -11,7 +11,7 @@ COPYRIGHT="2012-2019 Google Inc."
|
||||
LICENSE="Apache v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/ninja-build/ninja/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9"
|
||||
CHECKSUM_SHA256="3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f"
|
||||
PATCHES="ninja-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
@@ -46,3 +46,9 @@ INSTALL()
|
||||
mkdir -p $prefix/bin
|
||||
cp ninja $prefix/bin
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
python2 ./configure.py
|
||||
./ninja ninja_test
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
From c24f478eb03546f50db77bddd2ae522489df192f Mon Sep 17 00:00:00 2001
|
||||
From 5563d3429087517d2e47d672bdb5c50d005946dc Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Sat, 16 Sep 2017 12:25:48 +0200
|
||||
Subject: Add minimal Haiku support; based on Adrien's patch.
|
||||
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index 78cd1de..febf5aa 100755
|
||||
index 7d8ce90..45d0134 100755
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -56,6 +56,8 @@ class Platform(object):
|
||||
@@ -17,7 +17,7 @@ index 78cd1de..febf5aa 100755
|
||||
elif self._platform.startswith('netbsd'):
|
||||
self._platform = 'netbsd'
|
||||
elif self._platform.startswith('aix'):
|
||||
@@ -67,7 +69,7 @@ class Platform(object):
|
||||
@@ -69,7 +71,7 @@ class Platform(object):
|
||||
def known_platforms():
|
||||
return ['linux', 'darwin', 'freebsd', 'openbsd', 'solaris', 'sunos5',
|
||||
'mingw', 'msvc', 'gnukfreebsd', 'bitrig', 'netbsd', 'aix',
|
||||
@@ -26,7 +26,7 @@ index 78cd1de..febf5aa 100755
|
||||
|
||||
def platform(self):
|
||||
return self._platform
|
||||
@@ -94,6 +96,9 @@ class Platform(object):
|
||||
@@ -96,6 +98,9 @@ class Platform(object):
|
||||
def is_solaris(self):
|
||||
return self._platform == 'solaris'
|
||||
|
||||
@@ -36,7 +36,7 @@ index 78cd1de..febf5aa 100755
|
||||
def is_aix(self):
|
||||
return self._platform == 'aix'
|
||||
|
||||
@@ -467,11 +472,7 @@ if platform.supports_ninja_browse():
|
||||
@@ -472,11 +477,7 @@ if platform.supports_ninja_browse():
|
||||
|
||||
n.comment('the depfile parser and ninja lexers are generated using re2c.')
|
||||
def has_re2c():
|
||||
@@ -50,10 +50,10 @@ index 78cd1de..febf5aa 100755
|
||||
n.rule('re2c',
|
||||
command='re2c -b -i --no-generation-date -o $out $in',
|
||||
diff --git a/src/util.cc b/src/util.cc
|
||||
index 47a5de2..792fd77 100644
|
||||
index 4df2bb2..0f9ef18 100644
|
||||
--- a/src/util.cc
|
||||
+++ b/src/util.cc
|
||||
@@ -489,7 +489,7 @@ int GetProcessorCount() {
|
||||
@@ -496,7 +496,7 @@ int GetProcessorCount() {
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -63,10 +63,10 @@ index 47a5de2..792fd77 100644
|
||||
{
|
||||
static uint64_t previous_idle_ticks = 0;
|
||||
--
|
||||
2.19.1
|
||||
2.24.0
|
||||
|
||||
|
||||
From 4b00ba24550aebb13dc4b1c472f4d5a9afd2eb32 Mon Sep 17 00:00:00 2001
|
||||
From a8a897283f2cd96772714274947ede90e1100ae5 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Lotz <mmlr@mlotz.ch>
|
||||
Date: Sat, 16 Sep 2017 12:27:48 +0200
|
||||
Subject: Add include of sys/select.h to get FD_* definitions.
|
||||
@@ -88,20 +88,20 @@ index fc5543e..6fc9944 100644
|
||||
#include <spawn.h>
|
||||
|
||||
--
|
||||
2.19.1
|
||||
2.24.0
|
||||
|
||||
|
||||
From 14308098888664b2b423d336ff0bc423f1daf07a Mon Sep 17 00:00:00 2001
|
||||
From a39e384e883055f1e8157ca7abfe993e8c06d7e2 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 16 Sep 2017 12:48:42 +0200
|
||||
Subject: GetLoadAvg to be implemented for Haiku
|
||||
|
||||
|
||||
diff --git a/src/util.cc b/src/util.cc
|
||||
index 792fd77..c2710d9 100644
|
||||
index 0f9ef18..0309516 100644
|
||||
--- a/src/util.cc
|
||||
+++ b/src/util.cc
|
||||
@@ -489,7 +489,7 @@ int GetProcessorCount() {
|
||||
@@ -496,7 +496,7 @@ int GetProcessorCount() {
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -110,7 +110,7 @@ index 792fd77..c2710d9 100644
|
||||
static double CalculateProcessorLoad(uint64_t idle_ticks, uint64_t total_ticks)
|
||||
{
|
||||
static uint64_t previous_idle_ticks = 0;
|
||||
@@ -572,6 +572,10 @@ double GetLoadAverage() {
|
||||
@@ -583,6 +583,10 @@ double GetLoadAverage() {
|
||||
return -0.0f;
|
||||
return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0];
|
||||
}
|
||||
@@ -122,28 +122,5 @@ index 792fd77..c2710d9 100644
|
||||
double GetLoadAverage() {
|
||||
double loadavg[3] = { 0.0f, 0.0f, 0.0f };
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
||||
From 45182e179ee1cd0de033b77b44a9589792c6efac Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 9 Mar 2019 17:29:05 +0100
|
||||
Subject: Haiku has st_mtim.
|
||||
|
||||
|
||||
diff --git a/src/disk_interface.cc b/src/disk_interface.cc
|
||||
index d4c2fb0..e9e727d 100644
|
||||
--- a/src/disk_interface.cc
|
||||
+++ b/src/disk_interface.cc
|
||||
@@ -206,7 +206,7 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
|
||||
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__))
|
||||
+ defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__) || defined(__HAIKU__))
|
||||
// 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
|
||||
--
|
||||
2.19.1
|
||||
2.24.0
|
||||
|
||||
Reference in New Issue
Block a user