All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] qt: fix postgresql plugin configure
@ 2015-04-13 20:20 Thomas Petazzoni
  0 siblings, 0 replies; only message in thread
From: Thomas Petazzoni @ 2015-04-13 20:20 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=b37f428bacdca7859fb0b678ec9658cbccaa359a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Add upstream patch (see [1], [2]) which fixes a bug introduced by previous
patch '0007-configure-add-psql_config-option.patch'.

[1] https://bugreports.qt.io/browse/QTBUG-45463
[2] https://codereview.qt-project.org/110041

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...erIncludePath-and-filterLibraryPath-usage.patch |   36 ++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch b/package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch
new file mode 100644
index 0000000..6d66633
--- /dev/null
+++ b/package/qt/0008-Remove-filterIncludePath-and-filterLibraryPath-usage.patch
@@ -0,0 +1,36 @@
+From 8ae2c4e9ae59041384f95d9125d214ecb0b54f6f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?=
+ <perezmeyer@gmail.com>
+Date: Wed, 8 Apr 2015 21:45:37 -0300
+Subject: [PATCH] Remove filterIncludePath and filterLibraryPath usage.
+
+They are only defined in qt5's configure script.
+
+Task-number: QTBUG-45463
+Change-Id: Ibce2bd1d06e35de5174b15919c939b41cf013d05
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+
+Upstream: http://code.qt.io/cgit/qt/qt.git/patch/?id=90a09c7aedb3036aa1f572a959c67b1f8fcd9e9c
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index a3cde93..317e826 100755
+--- a/configure
++++ b/configure
+@@ -5575,8 +5575,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
+                 [ -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 | filterIncludePath`
+-                    QT_LFLAGS_PSQL=`$CFG_PSQL_CONFIG --libdir 2>/dev/null | filterLibraryPath`
++                    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"
+-- 
+2.1.4
+

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-04-13 20:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-13 20:20 [Buildroot] [git commit] qt: fix postgresql plugin configure Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.