Skip to content

Commit 49473ef

Browse files
committed
build: convert "echo" usage into a patch in qt package
1 parent 543693b commit 49473ef

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch
1212
$(package)_patches+= fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch
1313
$(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
1414
$(package)_patches+= freetype_back_compat.patch drop_lrelease_dependency.patch fix_powerpc_libpng.patch
15+
$(package)_patches+= fix_mingw_cross_compile.patch
1516

1617
# Update OSX_QT_TRANSLATIONS when this is updated
1718
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
@@ -217,8 +218,7 @@ define $(package)_preprocess_cmds
217218
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
218219
patch -p1 -i $($(package)_patch_dir)/fix_riscv64_arch.patch &&\
219220
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch &&\
220-
echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
221-
echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
221+
patch -p1 -i $($(package)_patch_dir)/fix_mingw_cross_compile.patch && \
222222
sed -i.old "s|QMAKE_CFLAGS += |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
223223
sed -i.old "s|QMAKE_CXXFLAGS += |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
224224
sed -i.old "0,/^QMAKE_LFLAGS_/s|^QMAKE_LFLAGS_|!host_build: QMAKE_LFLAGS = $($(package)_ldflags)\n&|" qtbase/mkspecs/win32-g++/qmake.conf && \
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
commit 5a992a549adfe5a587bbcd6cd2b2cee47d236e27
2+
Author: fanquake <[email protected]>
3+
Date: Fri Sep 4 08:13:44 2020 +0800
4+
5+
Work around broken mingw cross-compilation
6+
7+
See upstream issues:
8+
https://bugreports.qt.io/browse/QTBUG-63637
9+
https://bugreports.qt.io/browse/QTBUG-63659
10+
https://codereview.qt-project.org/q/8bebded9
11+
12+
We should be able to drop this once we are building qt 5.10.1 or later.
13+
14+
Added in #12971.
15+
16+
diff --git a/qtbase/mkspecs/win32-g++/qmake.conf b/qtbase/mkspecs/win32-g++/qmake.conf
17+
index e071a0d1..ad229b10 100644
18+
--- a/qtbase/mkspecs/win32-g++/qmake.conf
19+
+++ b/qtbase/mkspecs/win32-g++/qmake.conf
20+
@@ -87,3 +87,5 @@ QMAKE_NM = $${CROSS_COMPILE}nm -P
21+
include(../common/angle.conf)
22+
23+
load(qt_config)
24+
+QMAKE_LINK_OBJECT_MAX = 10
25+
+QMAKE_LINK_OBJECT_SCRIPT = object_script

0 commit comments

Comments
 (0)