ninja: bump version (#1643)

dev-util/ninja/ninja-1.8.2.recipe

@@ -7,11 +7,11 @@ Ninja's low-level approach makes it perfect for embedding into more featureful \
 build systems. Via gyp it can build Chrome and v8 and node.js etc.; via CMake \
 it can build LLVM, KDE, Blender, etc."
 HOMEPAGE="http://martine.github.io/ninja/"
-COPYRIGHT="2014 Google Inc."
+COPYRIGHT="2012-2017 Google Inc."
 LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="https://github.com/martine/ninja/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7"
+CHECKSUM_SHA256="86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4"
 PATCHES="ninja-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"

dev-util/ninja/patches/ninja-1.8.2.patchset

@@ -1,14 +1,14 @@
-From d7d59de2f79e0ce06043f56c29d0202569b88e62 Mon Sep 17 00:00:00 2001
+From 9d3bbca5b9aea5d2359053fb2434fe124a0b4898 Mon Sep 17 00:00:00 2001
 From: Augustin Cavalier <waddlesplash@gmail.com>
-Date: Tue, 15 Jul 2014 10:39:30 -0400
+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 2eacbfe..97919db 100755
+index a443748..42489e7 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -55,13 +55,15 @@ class Platform(object):
+@@ -56,6 +56,8 @@ class Platform(object):
              self._platform = 'msvc'
          elif self._platform.startswith('bitrig'):
              self._platform = 'bitrig'
@@ -16,26 +16,27 @@ index 2eacbfe..97919db 100755
 +            self._platform = 'haiku'
          elif self._platform.startswith('netbsd'):
              self._platform = 'netbsd'
- 
-     @staticmethod
+         elif self._platform.startswith('aix'):
+@@ -67,7 +69,7 @@ class Platform(object):
      def known_platforms():
        return ['linux', 'darwin', 'freebsd', 'openbsd', 'solaris', 'sunos5',
--              'mingw', 'msvc', 'gnukfreebsd', 'bitrig', 'netbsd']
-+              'mingw', 'msvc', 'gnukfreebsd', 'bitrig', 'netbsd', 'haiku']
+               'mingw', 'msvc', 'gnukfreebsd', 'bitrig', 'netbsd', 'aix',
+-              'dragonfly']
++              'dragonfly', 'haiku']
  
      def platform(self):
          return self._platform
-@@ -88,6 +90,9 @@ class Platform(object):
+@@ -94,6 +96,9 @@ class Platform(object):
      def is_solaris(self):
          return self._platform == 'solaris'
  
 +    def is_haiku(self):
 +        return self._platform == 'is_haiku'
 +
-     def uses_usr_local(self):
-         return self._platform in ('freebsd', 'openbsd', 'bitrig')
+     def is_aix(self):
+         return self._platform == 'aix'
  
-@@ -427,11 +432,7 @@ if platform.supports_ninja_browse():
+@@ -458,11 +463,7 @@ if platform.supports_ninja_browse():
  
  n.comment('the depfile parser and ninja lexers are generated using re2c.')
  def has_re2c():
@@ -49,10 +50,10 @@ index 2eacbfe..97919db 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 aa47f2f..3308025 100644
+index ae94d34..8af4b86 100644
 --- a/src/util.cc
 +++ b/src/util.cc
-@@ -507,7 +507,7 @@ int GetProcessorCount() {
+@@ -480,7 +480,7 @@ int GetProcessorCount() {
  #endif
  }
  
@@ -62,12 +63,12 @@ index aa47f2f..3308025 100644
  {
    static uint64_t previous_idle_ticks = 0;
 -- 
-2.11.0
+2.14.1
 
 
-From 364a8621f81fdab928ea41791463ed66787b7e4f Mon Sep 17 00:00:00 2001
+From 6e3e4c92e76c1cbe74883c51505eb5835e0c00ce Mon Sep 17 00:00:00 2001
 From: Michael Lotz <mmlr@mlotz.ch>
-Date: Sat, 19 Dec 2015 23:30:47 +0000
+Date: Sat, 16 Sep 2017 12:27:48 +0200
 Subject: Add include of sys/select.h to get FD_* definitions.
 
 Apparently these are pulled in by one of the already present headers
@@ -75,7 +76,7 @@ on other platforms. A cursory look at the POSIX specs did not reveal
 a requirement to expose these types with the given headers though.
 
 diff --git a/src/subprocess-posix.cc b/src/subprocess-posix.cc
-index f3baec2..6b27d7e 100644
+index 1de22c3..f77c559 100644
 --- a/src/subprocess-posix.cc
 +++ b/src/subprocess-posix.cc
 @@ -21,6 +21,7 @@
@@ -84,23 +85,23 @@ index f3baec2..6b27d7e 100644
  #include <string.h>
 +#include <sys/select.h>
  #include <sys/wait.h>
+ #include <spawn.h>
  
- #include "util.h"
 -- 
-2.11.0
+2.14.1
 
 
-From 5ec9e60993a9c93634371aa06fcae454fa364ce6 Mon Sep 17 00:00:00 2001
+From fce5475225744d3e3d55ba33a347dd24dc00d929 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sun, 16 Apr 2017 13:39:04 +0200
+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 3308025..bc9739c 100644
+index 8af4b86..1de47b8 100644
 --- a/src/util.cc
 +++ b/src/util.cc
-@@ -507,7 +507,7 @@ int GetProcessorCount() {
+@@ -480,7 +480,7 @@ int GetProcessorCount() {
  #endif
  }
  
@@ -109,9 +110,9 @@ index 3308025..bc9739c 100644
  static double CalculateProcessorLoad(uint64_t idle_ticks, uint64_t total_ticks)
  {
    static uint64_t previous_idle_ticks = 0;
-@@ -573,6 +573,10 @@ double GetLoadAverage() {
- 
-   return posix_compatible_load;
+@@ -563,6 +563,10 @@ double GetLoadAverage() {
+     return -0.0f;
+   return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0];
  }
 +#elif defined(__HAIKU__)
 +double GetLoadAverage() {
@@ -121,5 +122,5 @@ index 3308025..bc9739c 100644
  double GetLoadAverage() {
    double loadavg[3] = { 0.0f, 0.0f, 0.0f };
 -- 
-2.11.0
+2.14.1