diff options
| author | fanquake <fanquake@gmail.com> | 2018-04-11 22:55:18 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2018-04-11 22:55:18 +0800 |
| commit | 5b4fc3eca429456628a5db4e4090da294eb1eba1 (patch) | |
| tree | bf939df4dbe266ba98febc9495a62be7284dbc30 /depends/packages | |
| parent | fb17faefb8a314b8644dea3bd063faa1cbd7ae47 (diff) | |
| download | bitcoin-5b4fc3eca429456628a5db4e4090da294eb1eba1.tar.xz | |
depends: Fix Qt build with XCode 9.3
Diffstat (limited to 'depends/packages')
| -rw-r--r-- | depends/packages/qt.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 8491927552..745c9e1157 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -8,7 +8,8 @@ $(package)_dependencies=openssl zlib $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext $(package)_build_subdir=qtbase $(package)_qt_libs=corelib network widgets gui plugins testlib -$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch +$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch +$(package)_patches+=fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d @@ -141,6 +142,7 @@ define $(package)_preprocess_cmds patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \ patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \ patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \ + patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \ echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \ |