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/hack-out-pg2-4.7.0.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/hack-out-pg2-4.7.0.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch new file mode 100644 index 0000000000..39c5f4a32c --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Hack to not use the pg_config of the host system which will add /usr/include | ||
2 | |||
3 | pg_config is a native binary so using that when cross compiling | ||
4 | will always fail. The commented out fix would do, but for OE | ||
5 | our -platform and -xplatform is the same so we are actually not | ||
6 | really cross compiling. Just comment out the test, we are passing | ||
7 | the location to the postgres headers and if they are okay we | ||
8 | will pad. | ||
9 | |||
10 | Original Author: Holger Hans Peter Freyther <zecke@selfish.org> | ||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Index: qt-everywhere-opensource-src-4.7.0/configure | ||
14 | =================================================================== | ||
15 | --- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 | ||
16 | +++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 | ||
17 | @@ -4921,10 +4921,10 @@ | ||
18 | psql) | ||
19 | if [ "$CFG_SQL_psql" != "no" ]; then | ||
20 | # Be careful not to use native pg_config when cross building. | ||
21 | - if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
22 | - QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
23 | - QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
24 | - fi | ||
25 | +# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then | ||
26 | +# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` | ||
27 | +# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` | ||
28 | +# fi | ||
29 | [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" | ||
30 | [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" | ||
31 | # But, respect PSQL_LIBS if set | ||