haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

ninja, bump to 1.13.0 (#12531)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-06-28 19:23:08 +02:00
committed by GitHub
parent 433b185137
commit 8e38c8f308
2 changed files with 1 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev-build/ninja/ninja-1.12.1.recipe → dev-build/ninja/ninja-1.13.0.recipe
View File

@@ -11,8 +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="821bdff48a3f683bc4bb3b6f0b5fe7b2d647cf65d52aeb63328c91a6c6df285a"
PATCHES="ninja-$portVersion.patchset"
CHECKSUM_SHA256="f08641d00099a9e40d44ec0146f841c472ae58b7e6dd517bee3945cfd923cedf"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

56
dev-build/ninja/patches/ninja-1.12.1.patchset
View File

@@ -1,56 +0,0 @@
From b9bb78e8e8292121be1ad4e265127434f281fd25 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/src/util.cc b/src/util.cc
index 7668e33..a51bc7e 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -814,7 +814,7 @@ int GetProcessorCount() {
#endif
}
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__HAIKU__)
static double CalculateProcessorLoad(uint64_t idle_ticks, uint64_t total_ticks)
{
static uint64_t previous_idle_ticks = 0;
--
2.48.1
From 39387b0a89556bac65c523094d17c4bb01fdb1b7 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 a51bc7e..2c46090 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -814,7 +814,7 @@ int GetProcessorCount() {
#endif
}
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__HAIKU__)
+#if defined(_WIN32) || defined(__CYGWIN__)
static double CalculateProcessorLoad(uint64_t idle_ticks, uint64_t total_ticks)
{
static uint64_t previous_idle_ticks = 0;
@@ -905,6 +905,10 @@ double GetLoadAverage() {
double GetLoadAverage() {
return -0.0f;
}
+#elif defined(__HAIKU__)
+double GetLoadAverage() {
+ return -0.0f;
+}
#else
double GetLoadAverage() {
double loadavg[3] = { 0.0f, 0.0f, 0.0f };
--
2.48.1