0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  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. pg_config is a native binary so using that when cross compiling
  7. will always fail. The commented out fix would do, but for OE
  8. our -platform and -xplatform is the same so we are actually not
  9. really cross compiling. Just comment out the test, we are passing
  10. the location to the postgres headers and if they are okay we
  11. will pad.
  12. Upstream-Status: Inappropriate [configuration]
  13. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  14. Update for qt 4.8.7.
  15. Signed-off-by: Kai Kang <kai.kang@windriver.com>
  16. ---
  17. configure | 8 ++++----
  18. 1 file changed, 4 insertions(+), 4 deletions(-)
  19. diff --git a/configure b/configure
  20. index db4d044..35a8fe7 100755
  21. --- a/configure
  22. +++ b/configure
  23. @@ -5574,10 +5574,10 @@
  24. if [ "$CFG_SQL_psql" != "no" ]; then
  25. [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`
  26. # Be careful not to use native pg_config when cross building.
  27. - if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
  28. - QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
  29. - QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
  30. - fi
  31. +# if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
  32. +# QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
  33. +# QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
  34. +# fi
  35. [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
  36. [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
  37. # But, respect PSQL_LIBS if set
  38. --
  39. 1.8.0