diff options
Diffstat (limited to 'package/qt5')
| -rw-r--r-- | package/qt5/qt5base/0003-mkspecs-files.patch (renamed from package/qt5/qt5base/0002-mkspecs-files.patch) | 0 | ||||
| -rw-r--r-- | package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch | 27 | ||||
| -rw-r--r-- | package/qt5/qt5base/Config.in | 5 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base.mk | 1 |
4 files changed, 32 insertions, 1 deletions
diff --git a/package/qt5/qt5base/0002-mkspecs-files.patch b/package/qt5/qt5base/0003-mkspecs-files.patch index 09c1b67c11..09c1b67c11 100644 --- a/package/qt5/qt5base/0002-mkspecs-files.patch +++ b/package/qt5/qt5base/0003-mkspecs-files.patch diff --git a/package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch b/package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch new file mode 100644 index 0000000000..99d5928ab6 --- /dev/null +++ b/package/qt5/qt5base/0005-no-gold-linker-for-host-build.patch @@ -0,0 +1,27 @@ +Use the gold linker only for target builds + +Availability of the gold linker is only tested with the +cross-compiler, not the host compiler, so Qt shouldn't assume it's +available when doing host builds. + +This fixes build failures occuring when cross-compiling Qt5 with a +gold capable cross-compiler, on a host that has a too old compiler to +support gold. + +Bug reported upstream at https://bugreports.qt.io/browse/QTBUG-46125. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/mkspecs/features/default_post.prf +=================================================================== +--- a/mkspecs/features/default_post.prf ++++ b/mkspecs/features/default_post.prf +@@ -62,7 +62,7 @@ + QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE + } + +-use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD ++!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD + + dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL + static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 20fd905849..df1d3dc57c 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -61,10 +61,15 @@ config BR2_PACKAGE_QT5BASE_PSQL bool "PostgreSQL Plugin" select BR2_PACKAGE_POSTGRESQL depends on BR2_USE_MMU # postgresql + depends on !BR2_STATIC_LIBS help Build PostgreSQL plugin If unsure, say n. +comment "PostgreSQL plugin needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS + choice prompt "SQLite 3 support" default BR2_PACKAGE_QT5BASE_SQLITE_NONE diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 3de824f542..e2db5d1e02 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -174,7 +174,6 @@ define QT5BASE_CONFIGURE_CMDS PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" \ - $(QT5BASE_CONFIGURE_ENV) \ ./configure \ -v \ -prefix /usr \ |
