summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2012-01-25 17:22:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-01 15:07:42 (GMT)
commit37d93b9818f37bca8720655fbea28b5cb0577457 (patch)
treec1985856193ade3fcb34233d1566214bf4126845 /meta/recipes-qt
parent9123e9eb9bf324e5cc45b535934583b0e37f378b (diff)
downloadpoky-37d93b9818f37bca8720655fbea28b5cb0577457.tar.gz
qt4-tools-nativesdk-4.8.0: fix build
the build is actually failing because host g++ and ld are used to compile and link (From OE-Core rev: 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch (renamed from meta/recipes-qt/qt4/files/configure-lflags.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch18
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk.inc10
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb3
4 files changed, 27 insertions, 4 deletions
diff --git a/meta/recipes-qt/qt4/files/configure-lflags.patch b/meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
index a8e5945..a8e5945 100644
--- a/meta/recipes-qt/qt4/files/configure-lflags.patch
+++ b/meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch b/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch
new file mode 100644
index 0000000..d74f7fd
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch
@@ -0,0 +1,18 @@
1qt4-tools-native: set LFLAGS to pick up zlib from staging
2
3Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
4Upstream-Status: Pending
5
6Index: qt-everywhere-opensource-src-4.8.0/configure
7===================================================================
8--- qt-everywhere-opensource-src-4.8.0.orig/configure
9+++ qt-everywhere-opensource-src-4.8.0/configure
10@@ -611,7 +611,7 @@ fi
11 # initalize variables
12 #-------------------------------------------------------------------------------
13
14-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
15+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
16 for varname in $SYSTEM_VARIABLES; do
17 qmakevarname="${varname}"
18 # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 275fdcc..4b097cf 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 = "r7" 7INC_PR = "r8"
8 8
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" 9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
10 10
@@ -12,7 +12,6 @@ inherit nativesdk qmake2
12 12
13SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ 13SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
14 file://configure-lflags.patch \ 14 file://configure-lflags.patch \
15 file://compile.test-lflags.patch \
16 file://qt-config.patch \ 15 file://qt-config.patch \
17 file://qmake-exists-check.patch \ 16 file://qmake-exists-check.patch \
18 file://configure-paths.patch \ 17 file://configure-paths.patch \
@@ -51,12 +50,18 @@ EXTRA_OECONF = "-prefix ${prefix} \
51EXTRA_OEMAKE = " " 50EXTRA_OEMAKE = " "
52 51
53do_configure() { 52do_configure() {
53 # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
54 unset LD
55
54 if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then 56 if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
55 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ 57 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
56 fi 58 fi
57 59
58 cp ../g++.conf mkspecs/common 60 cp ../g++.conf mkspecs/common
59 cp ../linux.conf mkspecs/common 61 cp ../linux.conf mkspecs/common
62 # don't use host g++ even during configure
63 sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
64 sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
60 65
61 # first launch configure to get qmake compiled for the nativesdk 66 # first launch configure to get qmake compiled for the nativesdk
62 (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true 67 (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true
@@ -66,7 +71,6 @@ do_configure() {
66 if [ ! -e bin/qmake ]; then 71 if [ ! -e bin/qmake ]; then
67 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake 72 ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
68 fi 73 fi
69
70 (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" 74 (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
71} 75}
72 76
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
index 4c90d57..ea5e13d 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
@@ -3,7 +3,8 @@ require qt4-tools-nativesdk.inc
3PR = "${INC_PR}.0" 3PR = "${INC_PR}.0"
4 4
5SRC_URI += "file://blacklist-diginotar-certs.diff \ 5SRC_URI += "file://blacklist-diginotar-certs.diff \
6 file://fix-qtbug-20925.patch" 6 file://fix-qtbug-20925.patch \
7 file://compile.test-lflags.patch "
7 8
8SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" 9SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
9SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e" 10SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e"