summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-06-02 09:52:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-08 17:30:50 +0100
commit4d033fdc5e754e22edb2e9074e30e58847c4b791 (patch)
tree85189088f467605738c715ae5b2dcdc78c729354 /meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
parent3b1d89a51445cf526ca84eb5b53de434f9585d6e (diff)
downloadopenembedded-core-contrib-4d033fdc5e754e22edb2e9074e30e58847c4b791.tar.gz
qt4: upgrade to 4.8.7
Upgrade qt4 packages from version 4.8.6 to 4.8.7. * remove arm64 related patches which are merged * remove 0034-Fix-a-division-by-zero-when-processing-malformed-BMP.patch which is backported. * update 0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch and 0013-configure-add-crossarch-option.patch for new version * remove useless variable INC_PR Signed-off-by: Kai Kang <kai.kang@windriver.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
deleted file mode 100644
index 1d2ddab490..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4888791d1899f781af710dd8813887dea52fda59 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@selfish.org>
-Date: Wed, 26 Sep 2012 20:36:38 +0200
-Subject: [PATCH 10/21] configure: 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.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index db4d044..35a8fe7 100755
---- a/configure
-+++ b/configure
-@@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
- 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
---
-1.8.0
-