diff options
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-.patch | 46 |
1 files changed, 0 insertions, 46 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 deleted file mode 100644 index ca6a0b8d81..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.7/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch +++ /dev/null @@ -1,46 +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> - -Update for qt 4.8.7. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - configure | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index db4d044..35a8fe7 100755 ---- a/configure -+++ b/configure -@@ -5574,10 +5574,10 @@ - if [ "$CFG_SQL_psql" != "no" ]; then - [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config` - # Be careful not to use native pg_config when cross building. -- if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then -- QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null` -- QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null` -- fi -+# if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then -+# QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null` -+# QT_LFLAGS_PSQL=`$CFG_PSQL_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 - |