diff options
| author | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-11 14:42:35 -0800 |
|---|---|---|
| committer | Mikko Levonmaa <mikko.levonmaa@gmail.com> | 2012-12-11 14:42:35 -0800 |
| commit | bfe100c179c69d3b66cd74c5f3a4aa493cc49b15 (patch) | |
| tree | 6941e7d1a6f0a4336a6cbee9c827fe2561a4b997 /recipes-qt/qt5/qtjsbackend-native.inc | |
| parent | 921546e3288330c027154c2b671bf893fff9d293 (diff) | |
qtjsbackend: fix native dependency
Also fixes the broken qtjsbackent-native recipe
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtjsbackend-native.inc')
| -rw-r--r-- | recipes-qt/qt5/qtjsbackend-native.inc | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index db70fd11..8a66229a 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -3,12 +3,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffe DEPENDS = "qt5-native" +QT_MODULE = "qtjsbackend" + INC_PR = "r0" inherit native SRC_URI += "\ - file://qmake.conf \ + file://module_qmake.conf \ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ " @@ -16,15 +18,33 @@ SRC_URI += "\ # 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 + cat > ${WORKDIR}/qt.conf <<EOF +[Paths] +Prefix = ${prefix} +Binaries = ${bindir} +Headers = ${includedir}/qt5 +Plugins = ${libdir}/qt5/plugins +Libraries = ${libdir} +Imports = ${datadir}/qt5/imports +Qml2Imports = ${libdir}/qt5/qml +Documentation=${docdir}/qt5 +Data = ${datadir}/qt5 +HostPrefix = ${STAGING_DATADIR} +HostData = ${STAGING_DATADIR}/qt5 +HostBinaries = ${STAGING_BINDIR_NATIVE} +EOF + # 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 + cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf - ${STAGING_BINDIR_NATIVE}/qmake -d + ${STAGING_BINDIR_NATIVE}/qmake -d -r } do_install() { |