[OE-core] [PATCH v2] qt4-tools-nativesdk-4.8.0: fix build
Eric Bénard
eric at eukrea.com
Wed Jan 25 17:22:33 UTC 2012
the build is actually failing because host g++ and ld are used to
compile and link
Signed-off-by: Eric Bénard <eric at eukrea.com>
---
v2 : increment INC_PR
meta/recipes-qt/qt4/files/configure-lflags.patch | 18 ------------------
.../recipes-qt/qt4/qt-4.7.4/configure-lflags.patch | 18 ++++++++++++++++++
.../recipes-qt/qt4/qt-4.8.0/configure-lflags.patch | 18 ++++++++++++++++++
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 10 +++++++---
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 3 ++-
5 files changed, 45 insertions(+), 22 deletions(-)
delete mode 100644 meta/recipes-qt/qt4/files/configure-lflags.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch
diff --git a/meta/recipes-qt/qt4/files/configure-lflags.patch b/meta/recipes-qt/qt4/files/configure-lflags.patch
deleted file mode 100644
index a8e5945..0000000
--- a/meta/recipes-qt/qt4/files/configure-lflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-qt4-tools-native: set LFLAGS to pick up zlib from staging
-
-Original Author: Jeremy Lainé <jeremy.laine at m4x.org>
-Upstream-Status: Pending
-
-Index: qtopia-core-opensource-src-4.3.3/configure
-===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-14 08:53:51.000000000 +0000
-+++ qtopia-core-opensource-src-4.3.3/configure 2008-01-14 08:54:07.000000000 +0000
-@@ -447,7 +447,7 @@
- # initalize variables
- #-------------------------------------------------------------------------------
-
--SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"
-+SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
- for varname in $SYSTEM_VARIABLES; do
- cmd=`echo \
- 'if [ -n "\$'${varname}'" ]; then
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch b/meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
new file mode 100644
index 0000000..a8e5945
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
@@ -0,0 +1,18 @@
+qt4-tools-native: set LFLAGS to pick up zlib from staging
+
+Original Author: Jeremy Lainé <jeremy.laine at m4x.org>
+Upstream-Status: Pending
+
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-14 08:53:51.000000000 +0000
++++ qtopia-core-opensource-src-4.3.3/configure 2008-01-14 08:54:07.000000000 +0000
+@@ -447,7 +447,7 @@
+ # initalize variables
+ #-------------------------------------------------------------------------------
+
+-SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"
++SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
+ for varname in $SYSTEM_VARIABLES; do
+ cmd=`echo \
+ 'if [ -n "\$'${varname}'" ]; then
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 @@
+qt4-tools-native: set LFLAGS to pick up zlib from staging
+
+Original Author: Jeremy Lainé <jeremy.laine at m4x.org>
+Upstream-Status: Pending
+
+Index: qt-everywhere-opensource-src-4.8.0/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.8.0.orig/configure
++++ qt-everywhere-opensource-src-4.8.0/configure
+@@ -611,7 +611,7 @@ fi
+ # initalize variables
+ #-------------------------------------------------------------------------------
+
+-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
++SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
+ for varname in $SYSTEM_VARIABLES; do
+ qmakevarname="${varname}"
+ # 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"
HOMEPAGE = "http://qt.nokia.com"
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r7"
+INC_PR = "r8"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
@@ -12,7 +12,6 @@ inherit nativesdk qmake2
SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
file://configure-lflags.patch \
- file://compile.test-lflags.patch \
file://qt-config.patch \
file://qmake-exists-check.patch \
file://configure-paths.patch \
@@ -51,12 +50,18 @@ EXTRA_OECONF = "-prefix ${prefix} \
EXTRA_OEMAKE = " "
do_configure() {
+ # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
+ unset LD
+
if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
fi
cp ../g++.conf mkspecs/common
cp ../linux.conf mkspecs/common
+ # don't use host g++ even during configure
+ sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
+ sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
# first launch configure to get qmake compiled for the nativesdk
(echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true
@@ -66,7 +71,6 @@ do_configure() {
if [ ! -e bin/qmake ]; then
ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
fi
-
(echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
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
PR = "${INC_PR}.0"
SRC_URI += "file://blacklist-diginotar-certs.diff \
- file://fix-qtbug-20925.patch"
+ file://fix-qtbug-20925.patch \
+ file://compile.test-lflags.patch "
SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e"
--
1.7.7.5
More information about the Openembedded-core
mailing list