From 4888791d1899f781af710dd8813887dea52fda59 Mon Sep 17 00:00:00 2001 From: Holger Freyther 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 --- 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