diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-05-08 13:28:30 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-08 14:49:14 +0100 |
| commit | 649782175a1fc48e4207e18bc2244a50293a8034 (patch) | |
| tree | 51d719010115b6c7b220df6e6fa31e5f7b363324 /meta/recipes-qt/qt4/qt4-x11-free.inc | |
| parent | 38da655788361e949d605bebfab45cf5830df613 (diff) | |
| download | poky-649782175a1fc48e4207e18bc2244a50293a8034.tar.gz | |
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: 977ba301a1063a84b865ddf7367c35827fbffc86)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-x11-free.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index da989623f1..29bbfc6be0 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
| @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" | |||
| 5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
| 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
| 7 | 7 | ||
| 8 | INC_PR = "r43" | 8 | INC_PR = "r44" |
| 9 | 9 | ||
| 10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
| 11 | QT_GLFLAGS_qemux86 = "-opengl" | 11 | QT_GLFLAGS_qemux86 = "-opengl" |