summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
new file mode 100644
index 0000000000..ca6a0b8d81
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
@@ -0,0 +1,46 @@
1From 4888791d1899f781af710dd8813887dea52fda59 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 20:36:38 +0200
4Subject: [PATCH 10/21] configure: Hack to not use the pg_config of the host
5 system which will add /usr/include
6
7pg_config is a native binary so using that when cross compiling
8will always fail. The commented out fix would do, but for OE
9our -platform and -xplatform is the same so we are actually not
10really cross compiling. Just comment out the test, we are passing
11the location to the postgres headers and if they are okay we
12will pad.
13
14Upstream-Status: Inappropriate [configuration]
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17
18Update for qt 4.8.7.
19
20Signed-off-by: Kai Kang <kai.kang@windriver.com>
21---
22 configure | 8 ++++----
23 1 file changed, 4 insertions(+), 4 deletions(-)
24
25diff --git a/configure b/configure
26index db4d044..35a8fe7 100755
27--- a/configure
28+++ b/configure
29@@ -5574,10 +5574,10 @@
30 if [ "$CFG_SQL_psql" != "no" ]; then
31 [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`
32 # Be careful not to use native pg_config when cross building.
33- if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
34- QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
35- QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
36- fi
37+# if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
38+# QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
39+# QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
40+# fi
41 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
42 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
43 # But, respect PSQL_LIBS if set
44--
451.8.0
46