diff options
| author | fanquake <fanquake@gmail.com> | 2021-01-05 16:12:39 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-03-10 12:57:26 +0800 |
| commit | fa5e97e8c2cf93b7afc0d6b0c460700ec18d18f2 (patch) | |
| tree | 779b0af02fd70ff5eee37f078ddb15758e5e0098 /depends/packages | |
| parent | 1be8e0f2388e243d310fe7eeb46149a690de4ddf (diff) | |
| download | bitcoin-fa5e97e8c2cf93b7afc0d6b0c460700ec18d18f2.tar.xz | |
build: disable qt SDK version checking
This tries to invoke xcrun, which is not available when cross-compiling.
Given we are in control of the SDK versions being used, removing this
check has minimal-no effect.
Diffstat (limited to 'depends/packages')
| -rw-r--r-- | depends/packages/qt.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 2f88bb2310..aee31c7cf7 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -8,7 +8,7 @@ $(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch $(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch -$(package)_patches+= drop_lrelease_dependency.patch +$(package)_patches+= drop_lrelease_dependency.patch no_sdk_version_check.patch $(package)_patches+= fix_qpainter_non_determinism.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) @@ -225,6 +225,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \ patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_qpainter_non_determinism.patch &&\ + patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \ sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \ mkdir -p qtbase/mkspecs/macx-clang-linux &&\ cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ |