diff options
author | fanquake <fanquake@gmail.com> | 2020-09-04 08:23:19 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-11-14 08:54:17 +0800 |
commit | 49473ef211343a25658d7c2de17c92e3123ab33b (patch) | |
tree | 1300720f7bf7e9798d67766213c75eebe8d15f44 /depends/patches/qt | |
parent | 543693b92b954d186cb466a2f14b480f3bcf8c0b (diff) | |
download | bitcoin-49473ef211343a25658d7c2de17c92e3123ab33b.tar.xz |
build: convert "echo" usage into a patch in qt package
Diffstat (limited to 'depends/patches/qt')
-rw-r--r-- | depends/patches/qt/fix_mingw_cross_compile.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/depends/patches/qt/fix_mingw_cross_compile.patch b/depends/patches/qt/fix_mingw_cross_compile.patch new file mode 100644 index 0000000000..67f76f1d85 --- /dev/null +++ b/depends/patches/qt/fix_mingw_cross_compile.patch @@ -0,0 +1,25 @@ +commit 5a992a549adfe5a587bbcd6cd2b2cee47d236e27 +Author: fanquake <fanquake@gmail.com> +Date: Fri Sep 4 08:13:44 2020 +0800 + + Work around broken mingw cross-compilation + + See upstream issues: + https://bugreports.qt.io/browse/QTBUG-63637 + https://bugreports.qt.io/browse/QTBUG-63659 + https://codereview.qt-project.org/q/8bebded9 + + We should be able to drop this once we are building qt 5.10.1 or later. + + Added in #12971. + +diff --git a/qtbase/mkspecs/win32-g++/qmake.conf b/qtbase/mkspecs/win32-g++/qmake.conf +index e071a0d1..ad229b10 100644 +--- a/qtbase/mkspecs/win32-g++/qmake.conf ++++ b/qtbase/mkspecs/win32-g++/qmake.conf +@@ -87,3 +87,5 @@ QMAKE_NM = $${CROSS_COMPILE}nm -P + include(../common/angle.conf) + + load(qt_config) ++QMAKE_LINK_OBJECT_MAX = 10 ++QMAKE_LINK_OBJECT_SCRIPT = object_script |