diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc new file mode 100644 index 0000000000..0158dd6541 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -0,0 +1,34 @@ +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" + +DEPENDS = "qt5-native" + +INC_PR = "r0" + +inherit native + +#FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtjsbacked:" + +SRC_URI += "\ + file://qmake.conf \ + file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ + " + +# Bitbake will not respect the make order set by qmake and at times it will try to compile +# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail +PARALLEL_MAKE = "" + +do_configure() { + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + + # This should not be needed. Perhaps the lack of this file is an indication + # of an error on the native recipe... + cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf + + ${STAGING_BINDIR_NATIVE}/qmake -d +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} 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 0000000000..93a9be000f --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb @@ -0,0 +1,7 @@ +SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9" +SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" +S = "${WORKDIR}/git" + +require qtjsbackend-native.inc + +PR = "${INC_PR}.0" diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc new file mode 100644 index 0000000000..aebbc1f7f4 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend.inc @@ -0,0 +1,40 @@ +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" + +DEPENDS = "qtbase" + +INC_PR = "r0" + +inherit qmake5 + +SRC_URI += " \ + file://qmake.conf \ + file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ + " + +# Bitbake will not respect the make order set by qmake and at times it will try to compile +# parts of the source tree with out the 'mkv8snapshot' tool if it is enabled and that will fail +PARALLEL_MAKE = "" + +export QT_CONF_PATH="${WORKDIR}/qt.conf" + +do_configure () { + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + + # This should not be needed. Perhaps the lack of this file is an indication + # of an error on the native recipe... + cp ${WORKDIR}/qmake.conf ${S}/.qmake.conf + + ${OE_QMAKE_QMAKE} -d +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} +} + +FILES_${PN}-dev += "\ + ${STAGING_INCDIR}/qt5 \ + ${STAGING_DATADIR}/qt5 \ + ${libdir}/*.prl \ +" 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 0000000000..556ece1470 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch @@ -0,0 +1,32 @@ +From d962ede7b874be21af636e07205cbb3866d82b27 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 4 Dec 2012 11:20:13 -0800 +Subject: [PATCH] Install the mkv8snapshot tool to the native side + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++-- + 1 files 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.7.4.1 + 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 0000000000..8ec57ebac2 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend/0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch @@ -0,0 +1,30 @@ +From 3e07a136f42db68390cb9e20f5476e896f3bcd63 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +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 +--- + 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 + diff --git a/recipes-qt/qt5/qtjsbackend/qmake.conf b/recipes-qt/qt5/qtjsbackend/qmake.conf new file mode 100644 index 0000000000..42ba8e45fb --- /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 0000000000..2e83249a7d --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_4.999+git.bb @@ -0,0 +1,7 @@ +SRCREV = "89c7e60ca70d0ff8f26f311fa92b8109d275f6f9" +SRC_URI += "git://gitorious.org/qt/qtjsbackend.git;protocol=git" +S = "${WORKDIR}/git" + +require qtjsbackend.inc + +PR = "${INC_PR}.0"