Skip to content

Commit fa5e97e

Browse files
committed
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.
1 parent 1be8e0f commit fa5e97e

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon
88
$(package)_qt_libs=corelib network widgets gui plugins testlib
99
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch
1010
$(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
11-
$(package)_patches+= drop_lrelease_dependency.patch
11+
$(package)_patches+= drop_lrelease_dependency.patch no_sdk_version_check.patch
1212
$(package)_patches+= fix_qpainter_non_determinism.patch
1313

1414
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
@@ -225,6 +225,7 @@ define $(package)_preprocess_cmds
225225
patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
226226
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
227227
patch -p1 -i $($(package)_patch_dir)/fix_qpainter_non_determinism.patch &&\
228+
patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \
228229
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
229230
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
230231
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
commit f5eb142cd04be2bc4ca610ed3b5b7e8ce3520ee3
2+
Author: fanquake <[email protected]>
3+
Date: Tue Jan 5 16:08:49 2021 +0800
4+
5+
Don't invoke macOS SDK version checking
6+
7+
This tries to use xcrun which is not available when cross-compiling.
8+
9+
diff --git a/qtbase/mkspecs/features/mac/default_post.prf b/qtbase/mkspecs/features/mac/default_post.prf
10+
index 92a9112bca6..447e186eb26 100644
11+
--- a/qtbase/mkspecs/features/mac/default_post.prf
12+
+++ b/qtbase/mkspecs/features/mac/default_post.prf
13+
@@ -8,7 +8,6 @@ contains(TEMPLATE, .*app) {
14+
!macx-xcode:if(isEmpty(BUILDS)|build_pass) {
15+
# Detect changes to the platform SDK
16+
QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION QMAKE_XCODE_DEVELOPER_PATH
17+
- QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk)
18+
}
19+
20+
# Detect incompatible SDK versions

0 commit comments

Comments
 (0)