From 248cdaf0c8d989216cdaa56a92f66866e16d5a99 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 25 Sep 2022 17:03:07 +0200
Subject: [PATCH] ninja: bump version

---
 ...inja-1.10.2.recipe => ninja-1.11.1.recipe} | 12 +++++++---
 ...-1.10.2.patchset => ninja-1.11.1.patchset} | 22 +++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)
 rename dev-util/ninja/{ninja-1.10.2.recipe => ninja-1.11.1.recipe} (84%)
 rename dev-util/ninja/patches/{ninja-1.10.2.patchset => ninja-1.11.1.patchset} (74%)

diff --git a/dev-util/ninja/ninja-1.10.2.recipe b/dev-util/ninja/ninja-1.11.1.recipe
similarity index 84%
rename from dev-util/ninja/ninja-1.10.2.recipe
rename to dev-util/ninja/ninja-1.11.1.recipe
index 5e38a6bdd..ee73cdeb9 100644
--- a/dev-util/ninja/ninja-1.10.2.recipe
+++ b/dev-util/ninja/ninja-1.11.1.recipe
@@ -9,14 +9,19 @@ it can build LLVM, KDE, Blender, etc."
 HOMEPAGE="https://ninja-build.org/"
 COPYRIGHT="2012-2019 Google Inc."
 LICENSE="Apache v2"
-REVISION="5"
+REVISION="1"
 SOURCE_URI="https://github.com/ninja-build/ninja/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed"
+CHECKSUM_SHA256="31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea"
 PATCHES="ninja-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	ninja$secondaryArchSuffix = $portVersion
 	cmd:ninja = $portVersion
@@ -47,7 +52,8 @@ REQUIRES_zsh="
 
 BUILD()
 {
-	cmake -DCMAKE_BUILD_TYPE="Release" -Bbuild $cmakeDirArgs .
+	cmake -DCMAKE_BUILD_TYPE="Release" -Bbuild $cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir .
 	cd build
 	make $jobArgs
 }
diff --git a/dev-util/ninja/patches/ninja-1.10.2.patchset b/dev-util/ninja/patches/ninja-1.11.1.patchset
similarity index 74%
rename from dev-util/ninja/patches/ninja-1.10.2.patchset
rename to dev-util/ninja/patches/ninja-1.11.1.patchset
index f84c445fb..01c28cabe 100644
--- a/dev-util/ninja/patches/ninja-1.10.2.patchset
+++ b/dev-util/ninja/patches/ninja-1.11.1.patchset
@@ -1,14 +1,14 @@
-From 5563d3429087517d2e47d672bdb5c50d005946dc Mon Sep 17 00:00:00 2001
+From eaf2054190c9841dc5bf27a0a508e7ad4d36e157 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 4df2bb2..0f9ef18 100644
+index ef5f103..a6471d7 100644
 --- a/src/util.cc
 +++ b/src/util.cc
-@@ -496,7 +496,7 @@ int GetProcessorCount() {
+@@ -727,7 +727,7 @@ int GetProcessorCount() {
  #endif
  }
  
@@ -18,22 +18,20 @@ index 4df2bb2..0f9ef18 100644
  {
    static uint64_t previous_idle_ticks = 0;
 -- 
-2.24.0
+2.30.2
 
 
-
-
-From a39e384e883055f1e8157ca7abfe993e8c06d7e2 Mon Sep 17 00:00:00 2001
+From cd6610b3ba4981ee7a844a8148758940745ad9a8 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 0f9ef18..0309516 100644
+index a6471d7..55735f6 100644
 --- a/src/util.cc
 +++ b/src/util.cc
-@@ -496,7 +496,7 @@ int GetProcessorCount() {
+@@ -727,7 +727,7 @@ int GetProcessorCount() {
  #endif
  }
  
@@ -42,9 +40,9 @@ index 0f9ef18..0309516 100644
  static double CalculateProcessorLoad(uint64_t idle_ticks, uint64_t total_ticks)
  {
    static uint64_t previous_idle_ticks = 0;
-@@ -583,6 +583,10 @@ double GetLoadAverage() {
+@@ -818,6 +818,10 @@ double GetLoadAverage() {
+ double GetLoadAverage() {
      return -0.0f;
-   return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0];
  }
 +#elif defined(__HAIKU__)
 +double GetLoadAverage() {
@@ -54,5 +52,5 @@ index 0f9ef18..0309516 100644
  double GetLoadAverage() {
    double loadavg[3] = { 0.0f, 0.0f, 0.0f };
 -- 
-2.24.0
+2.30.2