diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-01-03 13:41:33 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:08:31 +0000 |
commit | 670706d1d3e3b16636818584fec0441f70b793d9 (patch) | |
tree | c732b65f9e5049fb5694cdbe648f08f262f5e911 /meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch | |
parent | 99a6e1a3a453c17575439723599da6bef62175bb (diff) | |
download | poky-670706d1d3e3b16636818584fec0441f70b793d9.tar.gz |
qt4: add version 4.8.0
Version 4.8.0 makes a few minor changes in the internal build system -
the following issues had to be worked around:
* The -qt-gif configure option has been removed. This is actually the
default and has been for some time, so remove it from qt4.inc.
* The mkspecs have been refactored requiring us to copy our g++.conf
file over the top of g++-unix.conf instead. Some modifications to this
file were also necessary to remove some settings that are now in other
conf files (and we don't modify those values in any case).
* The LD environment variable needs to be unset during configure, or
else the configure script overrides our value of QMAKE_LINK which
selects ${CXX} as our linker.
* QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure
script does not expect and cannot expand and this results in webkit
being disabled, so add a workaround for this.
(From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch new file mode 100644 index 0000000000..f302c5bd61 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthias Günther <matgnt@gmail.com> | ||
3 | Date: Wed, 12 May 2010 16:52:45 +0200 | ||
4 | Subject: [PATCH 1/9] Added Openembedded "-crossarch" option | ||
5 | |||
6 | Original Author: Michael Lauer <mickey@vanille-media.de> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- | ||
10 | configure | 7 ++++++- | ||
11 | 1 files changed, 6 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/configure b/configure | ||
14 | index facd192..9d15136 100755 | ||
15 | --- a/configure | ||
16 | +++ b/configure | ||
17 | @@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do | ||
18 | shift | ||
19 | VAL=$1 | ||
20 | ;; | ||
21 | - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) | ||
22 | + -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch) | ||
23 | VAR=`echo $1 | sed "s,^-\(.*\),\1,"` | ||
24 | shift | ||
25 | VAL="$1" | ||
26 | @@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do | ||
27 | xplatform) | ||
28 | XPLATFORM="$VAL" | ||
29 | ;; | ||
30 | + crossarch) | ||
31 | + CROSSARCH="$VAL" | ||
32 | + ;; | ||
33 | debug-and-release) | ||
34 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
35 | CFG_DEBUG_RELEASE="$VAL" | ||
36 | @@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then | ||
37 | CFG_ARCH=$CFG_HOST_ARCH | ||
38 | fi | ||
39 | |||
40 | +CFG_ARCH="$CROSSARCH" | ||
41 | + | ||
42 | if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then | ||
43 | if [ "$OPT_VERBOSE" = "yes" ]; then | ||
44 | echo " '$CFG_ARCH' is supported" | ||
45 | -- | ||
46 | 1.7.0.4 | ||
47 | |||