From 56d2c7f18d5058a168df01d6a4797514a0f958b6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 8 May 2013 22:20:41 +0200 Subject: qmake5_base: export OE_QMAKE variables only in qtbase recipes Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native.inc | 11 +++++++++++ recipes-qt/qt5/qtbase.inc | 11 +++++++++++ 2 files changed, 22 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index bb4ab986..cd54990d 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -74,6 +74,17 @@ EXTRA_OECONF = " \ -platform linux-oe-g++ \ " +# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell +export OE_QMAKE_COMPILER +export OE_QMAKE_CC +export OE_QMAKE_CFLAGS +export OE_QMAKE_CXX +export OE_QMAKE_CXXFLAGS +export OE_QMAKE_LINK +export OE_QMAKE_LDFLAGS +export OE_QMAKE_AR +export OE_QMAKE_STRIP + do_configure_prepend() { # Similar logic is in autotools.bbclass if [ -d ${B} -a "${S}" != "${B}" ] ; then diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 64de60bb..9348fc66 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -90,6 +90,17 @@ QMAKE_MKSPEC_PATH = "${B}" OE_QMAKE_QMAKE_ORIG := "${OE_QMAKE_QMAKE}" OE_QMAKE_QMAKE = "bin/qmake" +# qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell +export OE_QMAKE_COMPILER +export OE_QMAKE_CC +export OE_QMAKE_CFLAGS +export OE_QMAKE_CXX +export OE_QMAKE_CXXFLAGS +export OE_QMAKE_LINK +export OE_QMAKE_LDFLAGS +export OE_QMAKE_AR +export OE_QMAKE_STRIP + do_configure() { set_arch set_endian -- cgit v1.2.3-54-g00ecf