diff options
author | Luca Ceresoli <luca@lucaceresoli.net> | 2015-06-04 19:28:41 +0200 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2015-06-04 22:59:11 +0200 |
commit | 9a2cc7fe0aa00b64e815f9a267588ba75b2b74d1 (patch) | |
tree | 33a4dc95cce90445c5778346cbc7013bea50e246 /package/qt/0007-configure-add-psql_config-option.patch | |
parent | 9f4ec376567f94a68ea3e67a48f9a000814b04ca (diff) | |
download | buildroot-9a2cc7fe0aa00b64e815f9a267588ba75b2b74d1.tar.gz buildroot-9a2cc7fe0aa00b64e815f9a267588ba75b2b74d1.zip |
qt: bump to 4.8.7
Remove patches applied upstream.
Add hash file.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt/0007-configure-add-psql_config-option.patch')
-rw-r--r-- | package/qt/0007-configure-add-psql_config-option.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/package/qt/0007-configure-add-psql_config-option.patch b/package/qt/0007-configure-add-psql_config-option.patch deleted file mode 100644 index 3723afa1f8..0000000000 --- a/package/qt/0007-configure-add-psql_config-option.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c5f2c2d2b1e35606e38d5bf575bb6db74620c247 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Wed, 11 Mar 2015 20:55:42 +0100 -Subject: [PATCH] configure: add '-psql_config' option - -Allow setting of pg_config path for cross compilation (do -the same as for mysql_config). - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - configure | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index c7d2cea..a3cde93 100755 ---- a/configure -+++ b/configure -@@ -741,6 +741,7 @@ CFG_INCREMENTAL=auto - CFG_QCONFIG=full - CFG_DEBUG=auto - CFG_MYSQL_CONFIG= -+CFG_PSQL_CONFIG= - CFG_DEBUG_RELEASE=no - CFG_SHARED=yes - CFG_SM=auto -@@ -1159,7 +1160,7 @@ while [ "$#" -gt 0 ]; do - shift - VAL=$1 - ;; -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-psql_config|-sysroot) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1371,6 +1372,9 @@ while [ "$#" -gt 0 ]; do - mysql_config) - CFG_MYSQL_CONFIG="$VAL" - ;; -+ psql_config) -+ CFG_PSQL_CONFIG="$VAL" -+ ;; - prefix) - QT_INSTALL_PREFIX="$VAL" - ;; -@@ -5568,10 +5572,11 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do - ;; - psql) - if [ "$CFG_SQL_psql" != "no" ]; then -+ [ -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" ] && "$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` -+ 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` - 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 - |