[Buildroot] [PATCH 1/2] package/ninja: bump to version 1.10.0

[Buildroot] [PATCH 1/2] package/ninja: bump to version 1.10.0

[Adam Duskett]

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 package/ninja/ninja.hash | 2 +-
 package/ninja/ninja.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash
index f0b69e7f87..cd9bb08832 100644
--- a/package/ninja/ninja.hash
+++ b/package/ninja/ninja.hash
@@ -1,3 +1,3 @@
 # Locally generated
-sha256 5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9 ninja-1.9.0.tar.gz
+sha256 3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f ninja-1.10.0.tar.gz
 sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING
diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk
index 281cd70412..0d9426d1f4 100644
--- a/package/ninja/ninja.mk
+++ b/package/ninja/ninja.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NINJA_VERSION = 1.9.0
+NINJA_VERSION = 1.10.0
 NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION))
 NINJA_LICENSE = Apache-2.0
 NINJA_LICENSE_FILES = COPYING
-- 
2.24.1

[Buildroot] [PATCH 2/2] package/ninja: change package type to host-cmake

[Adam Duskett]

Ninja 1.10.0 now supports cmake as a build system. This change makes the make
file much more straightforward.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 package/ninja/ninja.mk | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk
index 0d9426d1f4..060893d85f 100644
--- a/package/ninja/ninja.mk
+++ b/package/ninja/ninja.mk
@@ -9,19 +9,8 @@ NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION))
 NINJA_LICENSE = Apache-2.0
 NINJA_LICENSE_FILES = COPYING
 
-# Although Ninja supports both Python2 and Python3, we enforce Python3
-# on the host for the following reason: Meson is the only package
-# using Ninja so far and Meson requires Python3. In this way, we
-# prevent both Python2 and Python3 from being created on the host,
-# which is time consuming and without benefit.
-HOST_NINJA_DEPENDENCIES = host-python3
-
-define HOST_NINJA_BUILD_CMDS
-	(cd $(@D); $(HOST_DIR)/bin/python3 configure.py --bootstrap)
-endef
-
 define HOST_NINJA_INSTALL_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja
 endef
 
-$(eval $(host-generic-package))
+$(eval $(host-cmake-package))
-- 
2.24.1

[Buildroot] [PATCH 1/2] package/ninja: bump to version 1.10.0

[Thomas Petazzoni]

On Mon,  3 Feb 2020 02:21:09 -0800
Adam Duskett <aduskett@gmail.com> wrote:

> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
>  package/ninja/ninja.hash | 2 +-
>  package/ninja/ninja.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Both applied, thanks. I've extended a bit the commit log for PATCH 2/2
when applying.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com