From: "Eric Bénard" <eric@eukrea.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] qt4-tools-nativesdk-4.8.0: fix build
Date: Wed, 25 Jan 2012 11:47:16 +0100 [thread overview]
Message-ID: <1327488436-28526-1-git-send-email-eric@eukrea.com> (raw)
the build is actually failing because host g++ and ld are used to
compile and link
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
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 | 8 ++++++--
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 3 ++-
5 files changed, 44 insertions(+), 21 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@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@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@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..796ad86 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -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
next reply other threads:[~2012-01-25 10:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-25 10:47 Eric Bénard [this message]
2012-01-25 12:01 ` [PATCH] qt4-tools-nativesdk-4.8.0: fix build Koen Kooi
2012-01-25 15:26 ` Eric Bénard
2012-01-25 16:52 ` Koen Kooi
2012-01-25 17:22 ` [PATCH v2] " Eric Bénard
2012-02-02 17:52 ` Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327488436-28526-1-git-send-email-eric@eukrea.com \
--to=eric@eukrea.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.