From 227d7e0cbaaf093f509f5728f06fad5f53caed7b Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 4 May 2022 17:27:52 -0600 Subject: [PATCH] package/ninja: add make jobserver support Switch to the Kitware(cmake maintainer) fork of ninja with make jobserver support. This fork has tagged releases based on upstream release tags with jobserver support added. It is sad that we need to switch to a fork to get this feature, but upstream is fighting it over philosophical issues, even though dozens of people request the feature and a PR for it has existed since 6 years [1]. [1] https://github.com/ninja-build/ninja/issues/1139 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/ninja/ninja.hash | 2 +- package/ninja/ninja.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index fd2c594a77..ecde199844 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed ninja-1.10.2.tar.gz +sha256 549c31ee596566b952c600e23eb9b8d39a4112cd5fdeb2e5a83370669176da40 ninja-1.10.2.g51db2.kitware.jobserver-1.tar.gz sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index ab1941023e..bc84046414 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,8 +4,9 @@ # ################################################################################ -NINJA_VERSION = 1.10.2 -NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) +NINJA_VERSION_MAJOR = 1.10.2 +NINJA_VERSION = $(NINJA_VERSION_MAJOR).g51db2.kitware.jobserver-1 +NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING