From 30c3c8420ec15f58d9d4696041480277b672a403 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 8 May 2012 13:28:30 +0800 Subject: qt4: move functions from python to shell style In qt4's do_configure operation, it will refer to some variables that are derived from 'd', however these variable values may be not correct in multilib case since the extraction of these variables happens before the multilib handler. The fix is to move these python style functions back to shell style. This fixes [YOCTO #2355] [RP: Fix whitepace] (From OE-Core rev: 98cb2efe4e9f3092d531c9fc809406c3ef559725) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie [SG: Resolve merge conflicts for 1.2.1] Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-qt/qt4/qt4.inc') diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 468a46ff74..23fda336b2 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -4,8 +4,6 @@ DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gst DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" require qt4_arch.inc -QT_ARCH := "${@qt_arch(d)}" -QT_ENDIAN = "${@qt_endian(d)}" QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" QT_DISTRO_FLAGS_linuxstdbase = "-sm" @@ -200,6 +198,9 @@ do_configure() { unset QMAKESPEC unset QTDIR + set_arch + set_endian + if [ ! -e bin/qmake ]; then ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake fi -- cgit v1.2.3-54-g00ecf