0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From 8ae2c4e9ae59041384f95d9125d214ecb0b54f6f Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
  3. <perezmeyer@gmail.com>
  4. Date: Wed, 8 Apr 2015 21:45:37 -0300
  5. Subject: [PATCH] Remove filterIncludePath and filterLibraryPath usage.
  6. They are only defined in qt5's configure script.
  7. Task-number: QTBUG-45463
  8. Change-Id: Ibce2bd1d06e35de5174b15919c939b41cf013d05
  9. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
  10. Upstream: http://code.qt.io/cgit/qt/qt.git/patch/?id=90a09c7aedb3036aa1f572a959c67b1f8fcd9e9c
  11. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  12. ---
  13. configure | 4 ++--
  14. 1 file changed, 2 insertions(+), 2 deletions(-)
  15. diff --git a/configure b/configure
  16. index a3cde93..317e826 100755
  17. --- a/configure
  18. +++ b/configure
  19. @@ -5575,8 +5575,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
  20. [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`
  21. # Be careful not to use native pg_config when cross building.
  22. if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
  23. - QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath`
  24. - QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath`
  25. + QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
  26. + QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
  27. fi
  28. [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
  29. [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
  30. --
  31. 2.1.4