summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorMikko Levonmaa <mikko.levonmaa@gmail.com>2012-12-04 12:06:06 -0800
committerMikko Levonmaa <mikko.levonmaa@gmail.com>2012-12-07 08:54:20 -0800
commita45a6a184fcacf3a6ba15f4b38e5988b83f4c30f (patch)
tree178d645d9c1075a7e81b03fdb752f0c4e87c2234 /recipes-qt/qt5
parentb514c5d67a259457383db532151a4bf6f482d158 (diff)
downloadmeta-qt5-a45a6a184fcacf3a6ba15f4b38e5988b83f4c30f.tar.gz
qtjsbackend: Initial recipe
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/qtjsbackend-native.inc34
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_4.999+git.bb7
-rw-r--r--recipes-qt/qt5/qtjsbackend.inc40
-rw-r--r--recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch32
-rw-r--r--recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch30
-rw-r--r--recipes-qt/qt5/qtjsbackend/qmake.conf1
-rw-r--r--recipes-qt/qt5/qtjsbackend_4.999+git.bb7
7 files changed, 151 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc
new file mode 100644
index 00000000..0158dd65
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend-native.inc
@@ -0,0 +1,34 @@
1LICENSE = "LGPLv2.1"
2LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
3
4DEPENDS = "qt5-native"
5
6INC_PR = "r0"
7
8inherit native
9
10#FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtjsbacked:"
11
12SRC_URI += "\
13 file://qmake.conf \
14 file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \
15 "
16
17# Bitbake will not respect the make order set by qmake and at times it will try to compile
18# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail
19PARALLEL_MAKE = ""
20
21do_configure() {
22 # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
23 unset LD
24
25 # This should not be needed. Perhaps the lack of this file is an indication
26 # of an error on the native recipe...
27 cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf
28
29 ${STAGING_BINDIR_NATIVE}/qmake -d
30}
31
32do_install() {
33 oe_runmake install INSTALL_ROOT=${D}
34}
diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb
new file mode 100644
index 00000000..93a9be00
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb
@@ -0,0 +1,7 @@
1SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9"
2SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git"
3S = "${WORKDIR}/git"
4
5require qtjsbackend-native.inc
6
7PR = "${INC_PR}.0"
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc
new file mode 100644
index 00000000..aebbc1f7
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend.inc
@@ -0,0 +1,40 @@
1LICENSE = "LGPLv2.1"
2LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
3
4DEPENDS = "qtbase"
5
6INC_PR = "r0"
7
8inherit qmake5
9
10SRC_URI += " \
11 file://qmake.conf \
12 file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \
13 "
14
15# Bitbake will not respect the make order set by qmake and at times it will try to compile
16# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail
17PARALLEL_MAKE = ""
18
19export QT_CONF_PATH="${WORKDIR}/qt.conf"
20
21do_configure () {
22 # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
23 unset LD
24
25 # This should not be needed. Perhaps the lack of this file is an indication
26 # of an error on the native recipe...
27 cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf
28
29 ${OE_QMAKE_QMAKE} -d
30}
31
32do_install() {
33 oe_runmake install INSTALL_ROOT=${D}
34}
35
36FILES_${PN}-dev += "\
37 ${STAGING_INCDIR}/qt5 \
38 ${STAGING_DATADIR}/qt5 \
39 ${libdir}/*.prl \
40"
diff --git a/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
new file mode 100644
index 00000000..556ece14
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
@@ -0,0 +1,32 @@
1From d962ede7b874be21af636e07205cbb3866d82b27 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 4 Dec 2012 11:20:13 -0800
4Subject: [PATCH] Install the mkv8snapshot tool to the native side
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
9---
10 src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
11 1 files changed, 7 insertions(+), 2 deletions(-)
12
13diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
14index 16beb02..5e327f7 100644
15--- a/src/tools/mkv8snapshot/mkv8snapshot.pro
16+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro
17@@ -24,5 +24,10 @@ unix:LIBS += -lpthread
18
19 # We don't need to install this tool, it's only used for building v8.
20 # However we do have to make sure that 'make install' builds it.
21-dummytarget.CONFIG = dummy_install
22-INSTALLS += dummytarget
23+#dummytarget.CONFIG = dummy_install
24+#INSTALLS += dummytarget
25+
26+# Install the tool so that during target cross compilation we have access to the native side binary
27+target.path = $$[QT_HOST_BINS]
28+INSTALLS += target
29+
30--
311.7.4.1
32
diff --git a/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch b/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch
new file mode 100644
index 00000000..8ec57eba
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch
@@ -0,0 +1,30 @@
1From 3e07a136f42db68390cb9e20f5476e896f3bcd63 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 4 Dec 2012 11:25:22 -0800
4Subject: [PATCH 2/2] Make sure that we pick up the mkv8snapshot tool
5 from the native sysroot
6
7Upstream-Status: Inappropriate [configuration]
8
9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
10---
11 src/v8/v8.pro | 3 ++-
12 1 files changed, 2 insertions(+), 1 deletions(-)
13
14diff --git a/src/v8/v8.pro b/src/v8/v8.pro
15index 2be6a19..2478e5f 100644
16--- a/src/v8/v8.pro
17+++ b/src/v8/v8.pro
18@@ -25,7 +25,8 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
19 include(v8.pri)
20
21 contains(QT_CONFIG, v8snapshot) {
22- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
23+ #mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
24+ mkv8snapshot.commands = mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
25 DUMMY_FILE = v8.pro
26 mkv8snapshot.input = DUMMY_FILE
27 mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
28--
291.7.4.1
30
diff --git a/recipes-qt/qt5/qtjsbackend/qmake.conf b/recipes-qt/qt5/qtjsbackend/qmake.conf
new file mode 100644
index 00000000..42ba8e45
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend/qmake.conf
@@ -0,0 +1 @@
load(qt_build_config)
diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_4.999+git.bb
new file mode 100644
index 00000000..2e83249a
--- /dev/null
+++ b/recipes-qt/qt5/qtjsbackend_4.999+git.bb
@@ -0,0 +1,7 @@
1SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9"
2SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git"
3S = "${WORKDIR}/git"
4
5require qtjsbackend.inc
6
7PR = "${INC_PR}.0"