diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-11-28 20:56:54 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-11-28 20:56:54 +0200 |
| commit | 855bd7550368f9dc64eaed85fe0a345b83f01613 (patch) | |
| tree | e449cccb0071ed4acd1564bd32e6f6726095ed18 /depends/packages/qt.mk | |
| parent | 4f8b1f8759301d2553183e14f72444a0f1d80725 (diff) | |
| download | bitcoin-855bd7550368f9dc64eaed85fe0a345b83f01613.tar.xz | |
build, qt: Ditch `no_sdk_version_check.patch`
Diffstat (limited to 'depends/packages/qt.mk')
| -rw-r--r-- | depends/packages/qt.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 4ee7a64a53..ea110b1653 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -10,7 +10,7 @@ $(package)_linguist_tools = lrelease lupdate lconvert $(package)_patches = qt.pro qttools_src.pro $(package)_patches += fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch $(package)_patches += support_new_android_ndks.patch fix_android_jni_static.patch dont_hardcode_pwd.patch -$(package)_patches += dont_hardcode_x86_64.patch no_sdk_version_check.patch +$(package)_patches += dont_hardcode_x86_64.patch $(package)_patches+= fix_lib_paths.patch fix_android_pch.patch $(package)_patches+= qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch $(package)_patches+= fix_montery_include.patch @@ -232,7 +232,6 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix_android_pch.patch && \ patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \ patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \ - patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \ patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \ @@ -253,6 +252,7 @@ endef define $(package)_config_cmds export PKG_CONFIG_SYSROOT_DIR=/ && \ export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \ + export QT_MAC_SDK_NO_VERSION_CHECK=1 && \ cd qtbase && \ ./configure -top-level $($(package)_config_opts) endef |