qtjsbackend: Use better patch to respect external-host-bindir
* mkv8snapshot isn't in default PATH when it's in ${bindir}/${QT_DIR_NAME} Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
a5783e1a09
commit
c2c53514ad
|
@ -13,7 +13,7 @@ SSTATE_SCAN_FILES += "*.pri *.prl"
|
||||||
inherit qmake5
|
inherit qmake5
|
||||||
|
|
||||||
SRC_URI += " \
|
SRC_URI += " \
|
||||||
file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \
|
file://0002-v8.pro-respect-external-host-bindir-when-set.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
# Bitbake will not respect the make order set by qmake and at times it will try to compile
|
# Bitbake will not respect the make order set by qmake and at times it will try to compile
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
From d962ede7b874be21af636e07205cbb3866d82b27 Mon Sep 17 00:00:00 2001
|
From 1539ddfc5f9c639554db98227c4d1de3b1f67792 Mon Sep 17 00:00:00 2001
|
||||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||||
Date: Tue, 4 Dec 2012 11:20:13 -0800
|
Date: Tue, 4 Dec 2012 11:20:13 -0800
|
||||||
Subject: [PATCH] Install the mkv8snapshot tool to the native side
|
Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [configuration]
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||||
---
|
---
|
||||||
src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
|
src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
|
||||||
1 files changed, 7 insertions(+), 2 deletions(-)
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
|
diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||||
index 16beb02..5e327f7 100644
|
index 16beb02..5e327f7 100644
|
||||||
|
@ -28,5 +28,5 @@ index 16beb02..5e327f7 100644
|
||||||
+INSTALLS += target
|
+INSTALLS += target
|
||||||
+
|
+
|
||||||
--
|
--
|
||||||
1.7.4.1
|
1.8.2.1
|
||||||
|
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
From 3e07a136f42db68390cb9e20f5476e896f3bcd63 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
|
||||||
Date: Tue, 4 Dec 2012 11:25:22 -0800
|
|
||||||
Subject: [PATCH 2/2] Make sure that we pick up the mkv8snapshot tool
|
|
||||||
from the native sysroot
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [configuration]
|
|
||||||
|
|
||||||
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
|
||||||
---
|
|
||||||
src/v8/v8.pro | 3 ++-
|
|
||||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/v8/v8.pro b/src/v8/v8.pro
|
|
||||||
index 2be6a19..2478e5f 100644
|
|
||||||
--- a/src/v8/v8.pro
|
|
||||||
+++ b/src/v8/v8.pro
|
|
||||||
@@ -25,7 +25,8 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
|
|
||||||
include(v8.pri)
|
|
||||||
|
|
||||||
contains(QT_CONFIG, v8snapshot) {
|
|
||||||
- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
|
|
||||||
+ #mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
|
|
||||||
+ mkv8snapshot.commands = mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
|
|
||||||
DUMMY_FILE = v8.pro
|
|
||||||
mkv8snapshot.input = DUMMY_FILE
|
|
||||||
mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
|
|
||||||
--
|
|
||||||
1.7.4.1
|
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
From 79deac4cdb9d223ed22a989f1d3e86fc3504c78e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
Date: Sun, 28 Apr 2013 02:45:01 +0200
|
||||||
|
Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
---
|
||||||
|
src/v8/v8.pro | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/v8/v8.pro b/src/v8/v8.pro
|
||||||
|
index 2be6a19..d3da4e1 100644
|
||||||
|
--- a/src/v8/v8.pro
|
||||||
|
+++ b/src/v8/v8.pro
|
||||||
|
@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
|
||||||
|
include(v8.pri)
|
||||||
|
|
||||||
|
contains(QT_CONFIG, v8snapshot) {
|
||||||
|
- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
|
||||||
|
+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix()
|
||||||
|
+ !exists($$mkv8snapshot.tool): \
|
||||||
|
+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix()
|
||||||
|
+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT}
|
||||||
|
DUMMY_FILE = v8.pro
|
||||||
|
mkv8snapshot.input = DUMMY_FILE
|
||||||
|
mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
|
||||||
|
--
|
||||||
|
1.8.2.1
|
||||||
|
|
Loading…
Reference in New Issue