From b0ae995bc813aae651a94092c035a8f5d5253c22 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 2 Aug 2016 09:00:15 +0100
Subject: ninja: support target builds

Extend the recipe so that it supports target builds.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-devtools/ninja/ninja-native_1.6.0.bb   | 25 ------------------
 meta-oe/recipes-devtools/ninja/ninja_1.6.0.bb      | 30 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 25 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/ninja/ninja-native_1.6.0.bb
 create mode 100644 meta-oe/recipes-devtools/ninja/ninja_1.6.0.bb

(limited to 'meta-oe/recipes-devtools/ninja')

diff --git a/meta-oe/recipes-devtools/ninja/ninja-native_1.6.0.bb b/meta-oe/recipes-devtools/ninja/ninja-native_1.6.0.bb
deleted file mode 100644
index c00710afd5..0000000000
--- a/meta-oe/recipes-devtools/ninja/ninja-native_1.6.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Ninja is a small build system with a focus on speed."
-HOMEPAGE = "http://martine.github.com/ninja/"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
-
-DEPENDS = "re2c-native"
-
-inherit native
-
-SRCREV="484c16336f19bd8970bb6e75322d61b92a229899"
-
-SRC_URI = "git://github.com/martine/ninja.git;branch=release"
-
-S="${WORKDIR}/git"
-
-do_configure[noexec] = "1"
-
-do_compile() {
-    python ${S}/configure.py --bootstrap
-}
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/ninja ${D}${bindir}/
-}
diff --git a/meta-oe/recipes-devtools/ninja/ninja_1.6.0.bb b/meta-oe/recipes-devtools/ninja/ninja_1.6.0.bb
new file mode 100644
index 0000000000..4d6c47e202
--- /dev/null
+++ b/meta-oe/recipes-devtools/ninja/ninja_1.6.0.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Ninja is a small build system with a focus on speed."
+HOMEPAGE = "http://martine.github.com/ninja/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e"
+
+DEPENDS = "re2c-native ninja-native"
+
+SRCREV = "484c16336f19bd8970bb6e75322d61b92a229899"
+
+SRC_URI = "git://github.com/martine/ninja.git;branch=release"
+
+S = "${WORKDIR}/git"
+
+do_configure[noexec] = "1"
+
+do_compile_class-native() {
+    ./configure.py --bootstrap
+}
+
+do_compile() {
+    ./configure.py
+    ninja
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/ninja ${D}${bindir}/
+}
+
+BBCLASSEXTEND = "native"
-- 
cgit 1.2.3-korg