diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-10 13:04:13 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-12 12:12:01 +0200 |
| commit | e40deb01179939de880188b95ff7f831bd8e963c (patch) | |
| tree | d6fb70953b9a9c384b2807094938b9bdd79c733f /rules/host-ninja.make | |
| parent | a30bb46f691f60626f3fc633cb37bd76b1ca7dd7 (diff) | |
| download | ptxdist-e40deb01179939de880188b95ff7f831bd8e963c.tar.gz ptxdist-e40deb01179939de880188b95ff7f831bd8e963c.tar.xz | |
host-ninja: version bump 1.5.1 -> 1.7.2
Also add patches to support make jobserver from PR #1140.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/host-ninja.make')
| -rw-r--r-- | rules/host-ninja.make | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/rules/host-ninja.make b/rules/host-ninja.make index 042c6ee83..712e59644 100644 --- a/rules/host-ninja.make +++ b/rules/host-ninja.make @@ -16,11 +16,11 @@ HOST_PACKAGES-$(PTXCONF_HOST_NINJA) += host-ninja # # Paths and names # -HOST_NINJA_VERSION := 1.5.1 -HOST_NINJA_MD5 := 59f4f1cf5d9bb0d7877a6d5a5afd770a +HOST_NINJA_VERSION := 1.7.2 +HOST_NINJA_MD5 := 7b482218757acbaeac4d4d54a3cd94e1 HOST_NINJA := ninja-$(HOST_NINJA_VERSION) HOST_NINJA_SUFFIX := tar.gz -HOST_NINJA_URL := https://github.com/martine/ninja/archive/v$(HOST_NINJA_VERSION).$(HOST_NINJA_SUFFIX) +HOST_NINJA_URL := https://github.com/ninja-build/ninja/archive/v$(HOST_NINJA_VERSION).$(HOST_NINJA_SUFFIX) HOST_NINJA_SOURCE := $(SRCDIR)/$(HOST_NINJA).$(HOST_NINJA_SUFFIX) HOST_NINJA_DIR := $(HOST_BUILDDIR)/$(HOST_NINJA) HOST_NINJA_LICENSE := Apache-2.0 @@ -30,12 +30,15 @@ HOST_NINJA_LICENSE := Apache-2.0 # ---------------------------------------------------------------------------- HOST_NINJA_PATH := PATH=$(HOST_PATH) +HOST_NINJA_CONF_OPT := \ + --bootstrap \ + $(if $(filter 1,$(PTXDIST_VERBOSE)),--verbose) $(STATEDIR)/host-ninja.compile: @$(call targetinfo) cd $(HOST_NINJA_DIR) && \ $(HOST_NINJA_PATH) \ - python bootstrap.py + ./configure.py $(HOST_NINJA_CONF_OPT) @$(call touch) # ---------------------------------------------------------------------------- @@ -44,7 +47,7 @@ $(STATEDIR)/host-ninja.compile: $(STATEDIR)/host-ninja.install: @$(call targetinfo) - install -D -m755 $(HOST_NINJA_DIR)/ninja $(HOST_NINJA_PKGDIR)/bin/ninja + @install -vD -m755 $(HOST_NINJA_DIR)/ninja $(HOST_NINJA_PKGDIR)/bin/ninja @$(call touch) # vim: syntax=make |