diff options
Diffstat (limited to 'package/qt5/qt5base')
3 files changed, 97 insertions, 2 deletions
diff --git a/package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch b/package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch new file mode 100644 index 0000000000..053d4296e7 --- /dev/null +++ b/package/qt5/qt5base/0006-configure-fix-gold-linker-support-detection.patch @@ -0,0 +1,36 @@ +From 6e750053cd6d183173a4c39f2b1080b3c9814d76 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard <peter@korsgaard.com> +Date: Sun, 15 Feb 2015 22:58:07 +0100 +Subject: [PATCH] configure: fix gold linker support detection + +Submitted upstream: https://bugreports.qt.io/browse/QTBUG-44487 + +While the -fuse-ld=gold flag is related to linking, it is an argument to the +compiler driver to tell it what linker to execute, NOT an option to tell the +linker to behave differently. + +So it shouldn't get prefixed with -Wl when passed though the compiler driver. + +Fixes http://autobuild.buildroot.net/results/92c/92c3fb4ddb934115b228652bb8c972bb7459bb40/ + +Signed-off-by: Peter Korsgaard <peter@korsgaard.com> +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 043d9fc..987d7f0 100755 +--- a/configure ++++ b/configure +@@ -3263,7 +3263,7 @@ fi + + # auto-detect -fuse-ld=gold support + if [ "$CFG_USE_GOLD_LINKER" != "no" ]; then +- if linkerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then ++ if compilerSupportsFlag $TEST_COMPILER -fuse-ld=gold; then + CFG_USE_GOLD_LINKER=yes + else + if [ "$CFG_USE_GOLD_LINKER" = "yes" ]; then +-- +2.1.3 + diff --git a/package/qt5/qt5base/0007-configure-add-psql_config-option.patch b/package/qt5/qt5base/0007-configure-add-psql_config-option.patch new file mode 100644 index 0000000000..7561314432 --- /dev/null +++ b/package/qt5/qt5base/0007-configure-add-psql_config-option.patch @@ -0,0 +1,60 @@ +From 95f2e4001f9c1721cbdb26d3f9c38511adae9c4b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Thu, 19 Feb 2015 22:41:02 +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 | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 0c66ecf..a832ae3 100755 +--- a/configure ++++ b/configure +@@ -578,6 +578,7 @@ CFG_WIDGETS=yes + CFG_QCONFIG=full + CFG_DEBUG=auto + CFG_MYSQL_CONFIG= ++CFG_PSQL_CONFIG= + CFG_DEBUG_RELEASE=no + CFG_FORCEDEBUGINFO=no + CFG_SHARED=yes +@@ -885,6 +886,7 @@ while [ "$#" -gt 0 ]; do + -arch| \ + -host-arch| \ + -mysql_config| \ ++ -psql_config| \ + -qpa| \ + -qconfig| \ + -qreal| \ +@@ -1066,6 +1068,9 @@ while [ "$#" -gt 0 ]; do + mysql_config) + CFG_MYSQL_CONFIG="$VAL" + ;; ++ psql_config) ++ CFG_PSQL_CONFIG="$VAL" ++ ;; + prefix) + QT_INSTALL_PREFIX="$VAL" + ;; +@@ -4369,10 +4374,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 | filterIncludePath` +- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null | filterLibraryPath` ++ 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 + diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index aaf4da07f6..4d344feba2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -67,8 +67,7 @@ QT5BASE_CONFIGURE_OPTS += -no-sql-mysql endif ifeq ($(BR2_PACKAGE_QT5BASE_PSQL),y) -QT5BASE_CONFIGURE_OPTS += -plugin-sql-psql -QT5BASE_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib +QT5BASE_CONFIGURE_OPTS += -plugin-sql-psql -psql_config $(STAGING_DIR)/usr/bin/pg_config QT5BASE_DEPENDENCIES += postgresql else QT5BASE_CONFIGURE_OPTS += -no-sql-psql |
