diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-05-08 13:28:30 +0800 |
|---|---|---|
| committer | Scott Garman <scott.a.garman@intel.com> | 2012-05-15 15:20:00 -0700 |
| commit | 98cb2efe4e9f3092d531c9fc809406c3ef559725 (patch) | |
| tree | 4924107ce82480beee70ea1a9211b245c7e881d0 /meta/recipes-qt/qt4/qt4.inc | |
| parent | 36634e16c0a0c80674bacf20f9841e3b042bd5fd (diff) | |
| download | openembedded-core-98cb2efe4e9f3092d531c9fc809406c3ef559725.tar.gz openembedded-core-98cb2efe4e9f3092d531c9fc809406c3ef559725.tar.bz2 openembedded-core-98cb2efe4e9f3092d531c9fc809406c3ef559725.zip | |
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]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[SG: Resolve merge conflicts for 1.2.1]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 5 |
1 files changed, 3 insertions, 2 deletions
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 |