From 9195d9dc805fd3132023ff33bc77ace1f3f7e40f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Sep 2016 10:06:40 +0300 Subject: qt5: update to Qt 5.8 The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Change-Id: I4c937c1acb3d204ac4560090cab3d0fc7e0e815a Reviewed-by: Risto Avila Reviewed-by: Jonathan Liu Reviewed-by: Samuli Piippo --- classes/qmake5_base.bbclass | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'classes') diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index f273567d..fa1bc563 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -31,18 +31,18 @@ EXTRA_OEMAKE = " \ " OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" -OE_QMAKE_COMPILER = "${CC}" -OE_QMAKE_CC = "${CC}" -OE_QMAKE_CFLAGS = "${CFLAGS}" -OE_QMAKE_CXX = "${CXX}" -OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -OE_QMAKE_LINK = "${CXX}" -OE_QMAKE_LDFLAGS = "${LDFLAGS}" -OE_QMAKE_AR = "${AR}" -OE_QMAKE_STRIP = "echo" -OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" +export OE_QMAKE_COMPILER = "${CC}" +export OE_QMAKE_CC = "${CC}" +export OE_QMAKE_CFLAGS = "${CFLAGS}" +export OE_QMAKE_CXX = "${CXX}" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +export OE_QMAKE_LINK = "${CXX}" +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" -OE_QMAKE_QTCONF = "-qtconf ${OE_QMAKE_QTCONF_PATH}" +export OE_QMAKE_QTCONF = "-qtconf ${OE_QMAKE_QTCONF_PATH}" inherit qmake5_paths remove-libtool -- cgit v1.2.3-54-g00ecf