qtjsbackend: refresh patches, move to subdirectory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
ebdd83f6b7
commit
71cc38affe
|
@ -0,0 +1,32 @@
|
||||||
|
From 293e982e084661e0caf686737dcdcda9e2e3e083 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||||
|
Date: Tue, 4 Dec 2012 11:20:13 -0800
|
||||||
|
Subject: [PATCH 1/3] Install the mkv8snapshot tool to the native side
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
|
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
|
||||||
|
---
|
||||||
|
src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
|
||||||
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||||
|
index 16beb02..5e327f7 100644
|
||||||
|
--- a/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||||
|
+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro
|
||||||
|
@@ -24,5 +24,10 @@ unix:LIBS += -lpthread
|
||||||
|
|
||||||
|
# We don't need to install this tool, it's only used for building v8.
|
||||||
|
# However we do have to make sure that 'make install' builds it.
|
||||||
|
-dummytarget.CONFIG = dummy_install
|
||||||
|
-INSTALLS += dummytarget
|
||||||
|
+#dummytarget.CONFIG = dummy_install
|
||||||
|
+#INSTALLS += dummytarget
|
||||||
|
+
|
||||||
|
+# Install the tool so that during target cross compilation we have access to the native side binary
|
||||||
|
+target.path = $$[QT_HOST_BINS]
|
||||||
|
+INSTALLS += target
|
||||||
|
+
|
||||||
|
--
|
||||||
|
1.8.3.2
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
From fa85676a52fb6e12e6db85ace4b6a2cfc1d5239a 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/3] 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.3.2
|
||||||
|
|
|
@ -186,5 +186,5 @@ index bf9f5ba..46d69b8 100644
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
1.8.2.1
|
1.8.3.2
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 1539ddfc5f9c639554db98227c4d1de3b1f67792 Mon Sep 17 00:00:00 2001
|
From 8ae71a0a3b898f95485148c9b2e89aeee9cf27e9 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 1/2] Install the mkv8snapshot tool to the native side
|
Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side
|
||||||
|
@ -28,5 +28,5 @@ index 16beb02..5e327f7 100644
|
||||||
+INSTALLS += target
|
+INSTALLS += target
|
||||||
+
|
+
|
||||||
--
|
--
|
||||||
1.8.2.1
|
1.8.3.2
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 79deac4cdb9d223ed22a989f1d3e86fc3504c78e Mon Sep 17 00:00:00 2001
|
From c40e89b048e225cfb961ac65a96a30ce3ec624f5 Mon Sep 17 00:00:00 2001
|
||||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
Date: Sun, 28 Apr 2013 02:45:01 +0200
|
Date: Sun, 28 Apr 2013 02:45:01 +0200
|
||||||
Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
|
Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
|
||||||
|
@ -27,5 +27,5 @@ index 2be6a19..d3da4e1 100644
|
||||||
mkv8snapshot.input = DUMMY_FILE
|
mkv8snapshot.input = DUMMY_FILE
|
||||||
mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
|
mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
|
||||||
--
|
--
|
||||||
1.8.2.1
|
1.8.3.2
|
||||||
|
|
Loading…
Reference in New Issue