From efa8aaf82e580a7d32eaaab48eb92d436f2e222a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 9 Feb 2017 07:26:09 +0100 Subject: qmake5_base.bbclass: set qt.conf by environment variable again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt update to 5.8 caused fallout in meta-qt5-extra. It turned out that qmake pulled in many pointers to native sysroot. Native sysroot is qmake's default in case no configuration file qt.conf is set. The problem with the new way of setting qt.conf by cmd parameter is that is has to be set explicitly. For instance all the packages coming from [1] use autotools for configuration. These ask qmake for paths during configuration and build further Makefiles during compile. To patch these for additional cmd parameter is nasty business. Setting qt.conf when building all qtbase's causes errors during configuration. To fix this we set the filename to a non existent file so that Qt's default is used. This dirty hack was necessary because there was no way found to export an empty variable OE_QMAKE_QTCONF_PATH. This patch was tested by building huge parts of meta-qt5-extra. The meta-layers did not yet contain oe-core's recipe-specific-sysroot changes so master build might fail for missing dependencies. [1] http://www.rncbc.org/drupal/ Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- classes/qmake5_base.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 50e5a306..df8f6246 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -41,8 +41,9 @@ export OE_QMAKE_LDFLAGS = "${LDFLAGS}" export OE_QMAKE_AR = "${AR}" export OE_QMAKE_STRIP = "echo" export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" -OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" -export OE_QMAKE_QTCONF = "-qtconf ${OE_QMAKE_QTCONF_PATH}" + +# qmake reads if from shell environment +export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" inherit qmake5_paths remove-libtool @@ -170,8 +171,8 @@ qmake5_base_do_configure () { # for config.tests to read this export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" - CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_QTCONF} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE" - ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_QTCONF} ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE || die "Error calling $CMD" + CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE" + ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE || die "Error calling $CMD" } qmake5_base_native_do_install() { -- cgit v1.2.3 From ee301d84a763f9a23499533ecd7cef20643b9431 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 10 Feb 2017 19:52:39 +0100 Subject: populate_sdk_qt5: use _append operator populate_sdk assigns TOOLCHAIN_HOST_TASK and TOOLCHAIN_TARGET_TASK with ?=. Thus depending on the order in which populate_sdk and populate_sdk-qt5 get parsed the assignments from populate_sdk are discarded and the resulting sdk is missing among others the environment-setup script. Signed-off-by: Max Krummenacher Signed-off-by: Martin Jansa --- classes/populate_sdk_qt5.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass index bbf137d7..a10341dc 100644 --- a/classes/populate_sdk_qt5.bbclass +++ b/classes/populate_sdk_qt5.bbclass @@ -2,7 +2,7 @@ inherit populate_sdk_qt5_base -TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host" -TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target" +TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt5-toolchain-host" +TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt5-toolchain-target" FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" -- cgit v1.2.3