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