summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-05-08 05:28:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 20:15:12 (GMT)
commit30c3c8420ec15f58d9d4696041480277b672a403 (patch)
tree1c14695c9d6336532a13624d63a6fae79842a096 /meta/recipes-qt
parenta74fb01b6b15cfa69fd507eb083cca26d2685867 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc5
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc5
-rw-r--r--meta/recipes-qt/qt4/qt4_arch.inc36
5 files changed, 24 insertions, 26 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 8c15352..05803d1 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
2SECTION = "libs" 2SECTION = "libs"
3HOMEPAGE = "http://qt.nokia.com" 3HOMEPAGE = "http://qt.nokia.com"
4DEPENDS += "directfb tslib" 4DEPENDS += "directfb tslib"
5INC_PR = "r43" 5INC_PR = "r46"
6 6
7QT_BASE_LIB ?= "libqt-embedded" 7QT_BASE_LIB ?= "libqt-embedded"
8 8
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index efb61bf..a1dd8df 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5LICENSE = "LGPLv2.1 | GPLv3" 5LICENSE = "LGPLv2.1 | GPLv3"
6 6
7INC_PR = "r10" 7INC_PR = "r11"
8 8
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
10 10
@@ -40,7 +40,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
40 -verbose -release -fast -static \ 40 -verbose -release -fast -static \
41 -platform ${TARGET_OS}-oe-g++ \ 41 -platform ${TARGET_OS}-oe-g++ \
42 -xplatform ${TARGET_OS}-oe-g++ \ 42 -xplatform ${TARGET_OS}-oe-g++ \
43 -arch ${@qt_arch(d)} \ 43 -arch ${QT_ARCH} \
44 -embedded -no-freetype -no-glib -no-iconv \ 44 -embedded -no-freetype -no-glib -no-iconv \
45 -qt3support \ 45 -qt3support \
46 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \ 46 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \
@@ -71,6 +71,7 @@ do_configure() {
71 if [ ! -e bin/qmake ]; then 71 if [ ! -e bin/qmake ]; then
72 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake 72 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
73 fi 73 fi
74 set_arch
74 (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" 75 (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
75} 76}
76 77
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 072c522..3335242 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"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r41" 8INC_PR = "r44"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 468a46f..23fda33 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
4DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 4DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
5 5
6require qt4_arch.inc 6require qt4_arch.inc
7QT_ARCH := "${@qt_arch(d)}"
8QT_ENDIAN = "${@qt_endian(d)}"
9 7
10QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm" 8QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
11QT_DISTRO_FLAGS_linuxstdbase = "-sm" 9QT_DISTRO_FLAGS_linuxstdbase = "-sm"
@@ -200,6 +198,9 @@ do_configure() {
200 unset QMAKESPEC 198 unset QMAKESPEC
201 unset QTDIR 199 unset QTDIR
202 200
201 set_arch
202 set_endian
203
203 if [ ! -e bin/qmake ]; then 204 if [ ! -e bin/qmake ]; then
204 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake 205 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
205 fi 206 fi
diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc
index bde68dc..c1d35ab 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
3ARM_INSTRUCTION_SET = "arm" 3ARM_INSTRUCTION_SET = "arm"
4 4
5def qt_arch(d): 5set_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
18def qt_endian(d): 15set_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