From 8d90317d8f9ed96f84867762ad96b67d6118b896 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 23 Apr 2013 00:58:55 +0200 Subject: [PATCH] qtjsbackend: Fix SEPB build and work around wrong mkspec install path (From meta-qt5 rev: 9fddbb70bdc71c5aa7feb93e62fa9da45e1230cc) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/qtjsbackend.inc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/meta-qt5/recipes-qt/qt5/qtjsbackend.inc b/meta-qt5/recipes-qt/qt5/qtjsbackend.inc index 3ee1017..13a5df5 100644 --- a/meta-qt5/recipes-qt/qt5/qtjsbackend.inc +++ b/meta-qt5/recipes-qt/qt5/qtjsbackend.inc @@ -11,7 +11,6 @@ INC_PR = "r0" inherit qmake5 SRC_URI += " \ - file://module_qmake.conf \ file://0002-Make-sure-that-we-pick-up-the-mkv8snapshot-tool.patch \ " @@ -19,15 +18,18 @@ 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 - # This should not be needed. Perhaps the lack of this file is an indication - # of an error on the native recipe... - cp ${WORKDIR}/module_qmake.conf ${S}/.qmake.conf + ${OE_QMAKE_QMAKE} -r -d ${S} +} - ${OE_QMAKE_QMAKE} -r -d +do_install_append () { + mv ${D}${QMAKE_MKSPEC_PATH}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs + TMP=`dirname ${D}/${QMAKE_MKSPEC_PATH}/mkspecs` + while test ${TMP} != ${D}; do + rmdir ${TMP} + TMP=`dirname ${TMP}`; + done } -- 2.7.4