Skip to content

Commit 29074ba

Browse files
committed
Merge bitcoin/bitcoin#23618: build, qt: Ditch no_sdk_version_check.patch
855bd75 build, qt: Ditch `no_sdk_version_check.patch` (Hennadii Stepanov) Pull request description: Since Qt 5.12.2 (see qt/qtbase@5d18196) it is possible to control whether to check macOS SDK with the `QT_MAC_SDK_NO_VERSION_CHECK` variable. ACKs for top commit: fanquake: ACK 855bd75 Tree-SHA512: e490f22da9c37d25b58418ca62e65d2303cfbd83139f4abea4b67c37fa97e9a882ccc9d484b49cd2bb3a8851ea35e63123d3c6db7f804d6b50f41b10bd10c10b
2 parents 8b07145 + 855bd75 commit 29074ba

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $(package)_linguist_tools = lrelease lupdate lconvert
1010
$(package)_patches = qt.pro qttools_src.pro
1111
$(package)_patches += fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch
1212
$(package)_patches += support_new_android_ndks.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
13-
$(package)_patches += dont_hardcode_x86_64.patch no_sdk_version_check.patch
13+
$(package)_patches += dont_hardcode_x86_64.patch
1414
$(package)_patches+= fix_lib_paths.patch fix_android_pch.patch
1515
$(package)_patches+= qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
1616
$(package)_patches+= fix_montery_include.patch
@@ -232,7 +232,6 @@ define $(package)_preprocess_cmds
232232
patch -p1 -i $($(package)_patch_dir)/fix_android_pch.patch && \
233233
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
234234
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \
235-
patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \
236235
patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \
237236
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
238237
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
@@ -253,6 +252,7 @@ endef
253252
define $(package)_config_cmds
254253
export PKG_CONFIG_SYSROOT_DIR=/ && \
255254
export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
255+
export QT_MAC_SDK_NO_VERSION_CHECK=1 && \
256256
cd qtbase && \
257257
./configure -top-level $($(package)_config_opts)
258258
endef

depends/patches/qt/no_sdk_version_check.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)