cirros-testvm/src-cirros/buildroot-2015.05/package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch

   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
   7 They are only defined in qt5's configure script.
   8
   9 Task-number: QTBUG-45463
  10 Change-Id: Ibce2bd1d06e35de5174b15919c939b41cf013d05
  11 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
  12
  13 Upstream: http://code.qt.io/cgit/qt/qt.git/patch/?id=90a09c7aedb3036aa1f572a959c67b1f8fcd9e9c
  14 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  15 ---
  16  configure | 4 ++--
  17  1 file changed, 2 insertions(+), 2 deletions(-)
  18
  19 diff --git a/configure b/configure
  20 index a3cde93..317e826 100755
  21 --- a/configure
  22 +++ b/configure
  23 @@ -5575,8 +5575,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
  24                  [ -z "$CFG_PSQL_CONFIG" ] && CFG_PSQL_CONFIG=`"$WHICH" pg_config`
  25                  # Be careful not to use native pg_config when cross building.
  26                  if [ "$XPLATFORM_MINGW" != "yes" ] && [ -x "$CFG_PSQL_CONFIG" ]; then
  27 -                    QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null | filterIncludePath`
  28 -                    QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath`
  29 +                    QT_CFLAGS_PSQL=`$CFG_PSQL_CONFIG --includedir 2>/dev/null`
  30 +                    QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null`
  31                  fi
  32                  [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
  33                  [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
  34 --
  35 2.1.4
  36