diff options
| author | Eric Bénard <eric@eukrea.com> | 2011-09-20 22:07:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-04 11:34:22 +0100 |
| commit | 68189d7c372a861767b5db90376d61e165f9771b (patch) | |
| tree | b38f1c1ed383bd7ea8d1ec114f8e85487123e7ce /meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch | |
| parent | 8d5a5d78f9e83c64ebddcecd7c4fd89cc1264163 (diff) | |
| download | openembedded-core-68189d7c372a861767b5db90376d61e165f9771b.tar.gz openembedded-core-68189d7c372a861767b5db90376d61e165f9771b.tar.bz2 openembedded-core-68189d7c372a861767b5db90376d61e165f9771b.tar.xz openembedded-core-68189d7c372a861767b5db90376d61e165f9771b.zip | |
qt4: Update to latest version 4.7.4
- 4.7.4 was release on the 1st of september, the changelog is available
here : http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4
and mostly contains bug fix.
- this patch include the fix for QTBUG-20925 which was a regression
against 4.7.3 : https://bugreports.qt.nokia.com/browse/QTBUG-20925
http://qt.gitorious.org/qt/qt/commit/852abfca6f4c349dce9b895956922f96d82df579
thanks to Paul Eggleton to point us to this bug.
Signed-off-by: Eric Bénard <eric@eukrea.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch new file mode 100644 index 000000000..39c5f4a32 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch @@ -0,0 +1,31 @@ +Hack to not use the pg_config of the host system which will add /usr/include + +pg_config is a native binary so using that when cross compiling +will always fail. The commented out fix would do, but for OE +our -platform and -xplatform is the same so we are actually not +really cross compiling. Just comment out the test, we are passing +the location to the postgres headers and if they are okay we +will pad. + +Original Author: Holger Hans Peter Freyther <zecke@selfish.org> +Upstream-Status: Inappropriate [configuration] + +Index: qt-everywhere-opensource-src-4.7.0/configure +=================================================================== +--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 ++++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 +@@ -4921,10 +4921,10 @@ + psql) + if [ "$CFG_SQL_psql" != "no" ]; then + # Be careful not to use native pg_config when cross building. +- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then +- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` +- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` +- fi ++# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then ++# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` ++# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` ++# fi + [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" + [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" + # But, respect PSQL_LIBS if set |