* [PATCH] qt4-tools-nativesdk-4.8.0: fix build
@ 2012-01-25 10:47 Eric Bénard
2012-01-25 12:01 ` Koen Kooi
0 siblings, 1 reply; 6+ messages in thread
From: Eric Bénard @ 2012-01-25 10:47 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] qt4-tools-nativesdk-4.8.0: fix build
2012-01-25 10:47 [PATCH] qt4-tools-nativesdk-4.8.0: fix build Eric Bénard
@ 2012-01-25 12:01 ` Koen Kooi
2012-01-25 15:26 ` Eric Bénard
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2012-01-25 12:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 25 jan. 2012, om 11:47 heeft Eric Bénard het volgende geschreven:
> the build is actually failing because host g++ and ld are used to
> compile and link
This is missing a PR bump in the affected recipes.
regards,
Koen
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] qt4-tools-nativesdk-4.8.0: fix build
2012-01-25 12:01 ` Koen Kooi
@ 2012-01-25 15:26 ` Eric Bénard
2012-01-25 16:52 ` Koen Kooi
0 siblings, 1 reply; 6+ messages in thread
From: Eric Bénard @ 2012-01-25 15:26 UTC (permalink / raw)
To: openembedded-core
Hi Koen,
Le Wed, 25 Jan 2012 13:01:26 +0100,
Koen Kooi <koen@dominion.thruhere.net> a écrit :
>
> Op 25 jan. 2012, om 11:47 heeft Eric Bénard het volgende geschreven:
>
> > the build is actually failing because host g++ and ld are used to
> > compile and link
>
> This is missing a PR bump in the affected recipes.
>
as the recipes don't actually build do you think the PR bump in
necessary ?
Eric
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] qt4-tools-nativesdk-4.8.0: fix build
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
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2012-01-25 16:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 25 jan. 2012, om 16:26 heeft Eric Bénard het volgende geschreven:
> Hi Koen,
>
> Le Wed, 25 Jan 2012 13:01:26 +0100,
> Koen Kooi <koen@dominion.thruhere.net> a écrit :
>
>>
>> Op 25 jan. 2012, om 11:47 heeft Eric Bénard het volgende geschreven:
>>
>>> the build is actually failing because host g++ and ld are used to
>>> compile and link
>>
>> This is missing a PR bump in the affected recipes.
>>
> as the recipes don't actually build do you think the PR bump in
> necessary ?
It would avoid the need to tell people to do 'bitbake -c cleansstate <foo>'
regards,
Koen
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] qt4-tools-nativesdk-4.8.0: fix build
2012-01-25 16:52 ` Koen Kooi
@ 2012-01-25 17:22 ` Eric Bénard
2012-02-02 17:52 ` Saul Wold
0 siblings, 1 reply; 6+ messages in thread
From: Eric Bénard @ 2012-01-25 17:22 UTC (permalink / raw)
To: openembedded-core
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>
---
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@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..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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] qt4-tools-nativesdk-4.8.0: fix build
2012-01-25 17:22 ` [PATCH v2] " Eric Bénard
@ 2012-02-02 17:52 ` Saul Wold
0 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-02-02 17:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 01/25/2012 09:22 AM, Eric Bénard wrote:
> 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>
> ---
> 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
>
Merged into OE-core
Thanks
Sau!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-02-02 17:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-25 10:47 [PATCH] qt4-tools-nativesdk-4.8.0: fix build Eric Bénard
2012-01-25 12:01 ` 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox