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-31 21:15:12 +0100 |
commit | 30c3c8420ec15f58d9d4696041480277b672a403 (patch) | |
tree | 1c14695c9d6336532a13624d63a6fae79842a096 /meta/recipes-qt/qt4/qt4_arch.inc | |
parent | a74fb01b6b15cfa69fd507eb083cca26d2685867 (diff) | |
download | poky-30c3c8420ec15f58d9d4696041480277b672a403.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: 98cb2efe4e9f3092d531c9fc809406c3ef559725)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4_arch.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4_arch.inc | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc index bde68dc2e0..c1d35ab726 100644 --- a/meta/recipes-qt/qt4/qt4_arch.inc +++ b/meta/recipes-qt/qt4/qt4_arch.inc | |||
@@ -2,24 +2,20 @@ inherit siteinfo | |||
2 | 2 | ||
3 | ARM_INSTRUCTION_SET = "arm" | 3 | ARM_INSTRUCTION_SET = "arm" |
4 | 4 | ||
5 | def qt_arch(d): | 5 | set_arch() { |
6 | import bb, re | 6 | case ${TARGET_ARCH} in |
7 | arch = d.getVar('TARGET_ARCH', True) | 7 | arm*) QT_ARCH=arm ;; |
8 | if re.match("^i.86$", arch): | 8 | i*86*) QT_ARCH=i386 ;; |
9 | arch = "i386" | 9 | mips*) QT_ARCH=mips ;; |
10 | elif re.match("^arm.*", arch): | 10 | powerpc*) QT_ARCH=powerpc ;; |
11 | arch = "arm" | 11 | x86_64*) QT_ARCH=x86_64 ;; |
12 | elif arch == "x86_64": | 12 | esac |
13 | arch = "x86" | 13 | } |
14 | elif arch == "mipsel": | ||
15 | arch = "mips" | ||
16 | return arch | ||
17 | 14 | ||
18 | def qt_endian(d): | 15 | set_endian() { |
19 | import bb | 16 | if [ ${SITEINFO_ENDIANNESS} = "le" ] ; then |
20 | if d.getVar('SITEINFO_ENDIANNESS', True) == "le": | 17 | QT_ENDIAN="-little-endian" |
21 | return "-little-endian" | 18 | elif [ ${SITEINFO_ENDIANNESS} = "be" ] ; then |
22 | elif d.getVar('SITEINFO_ENDIANNESS', True) == "be": | 19 | QT_ENDIAN="-big-endian" |
23 | return "-big-endian" | 20 | fi |
24 | else: | 21 | } |
25 | assert False | ||