build: use macOS 14 SDK (Xcode 15.0) #28622

fanquake · 2023-10-09T13:51:37Z

This fixes: #28349 (comment) (cross-compiling with C++20 for macOS). See https://developer.apple.com/xcode/cpp/#c++20 for C++20 support in Apples libc++, some features landed with Xcode 14.3, although many more landed with Xcode 15.0.

DrahtBot · 2023-10-09T13:51:40Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	hebasto, TheCharlatan
Concept ACK	theuni

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

No conflicts as of last run.

hebasto · 2023-10-09T13:53:15Z

Concept ACK.

maflcko · 2023-10-09T14:00:35Z

Does this affect which versions of macos the app can be run on?

hebasto · 2023-10-09T14:01:55Z

Does this affect which versions of macos the app can be run on?

It depends on the -mmacosx-version-min option?

contrib/macdeploy/README.md

fanquake · 2023-10-17T13:14:00Z

Pushed up a new version, that reduces the size of the SDK tarball by ~90%. Should reduce the potential for random difference/non-determinism in the tarballs.

Sjors · 2023-10-23T10:39:31Z

Still getting a different hash when using the gen-sdk script in f638625:

70cccc19df2fc1746bfddf939bf7370eb0b3d8f5f7198896358fa1ebde37e9e7  Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers.tar.gz

Both on macOS and Ubuntu.

josibake · 2023-10-23T12:10:23Z

I'm getting the same as @Sjors :

70cccc19df2fc1746bfddf939bf7370eb0b3d8f5f7198896358fa1ebde37e9e7  Xcode-15.0-15A240d-extracted-SDK-with-libcxx-headers.tar.gz

fanquake · 2023-10-23T12:51:32Z

Updated the hash. Also going to test the 15.1 beta, to see if that fixes the Qt build issues.

contrib/macdeploy/gen-sdk

fanquake · 2023-10-30T16:35:07Z

Also going to test the 15.1 beta, to see if that fixes the Qt build issues.

No difference with Xcode 15.1-beta2. Qt still fails to build the same way as described in the PR description.

8047bb6 build: Update `qt` package up to 5.15.11 (Hennadii Stepanov) Pull request description: In the light of bitcoin/bitcoin#28622, we probably have to patch Qt. It seems reasonable to update it up to the latest available version before doing that. ACKs for top commit: TheCharlatan: ACK 8047bb6 Tree-SHA512: b4d7df2ff059b8f58c3202d913237c0d39a962748658f1ce853884dca095fbda5f56d4d68f73a1bc8da2f295e96a20927306e148b41a9f4afc42c8edb11c3729

hebasto · 2023-11-02T11:38:38Z

Qt still fails to build the same way as described in the PR description.

The following patch fixes the Qt build for me:

--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -1,4 +1,5 @@
 OSX_MIN_VERSION=11.0
+_OSX_MIN_VERSION=110000
 OSX_SDK_VERSION=14.0
 XCODE_VERSION=15.0.1
 XCODE_BUILD_ID=15A507
@@ -75,7 +76,7 @@ $(foreach TOOL,$(cctools_TOOLS),$(eval darwin_$(TOOL) = $$(build_prefix)/bin/$$(
 darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
               -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
               -u LIBRARY_PATH \
-            $(clang_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
+            $(clang_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) -D__MAC_OS_X_VERSION_MIN_REQUIRED=$(_OSX_MIN_VERSION) \
               -B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
               -isysroot$(OSX_SDK) -nostdlibinc \
               -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
@@ -83,7 +84,7 @@ darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
 darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
                -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
                -u LIBRARY_PATH \
-             $(clangxx_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
+             $(clangxx_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) -D__MAC_OS_X_VERSION_MIN_REQUIRED=$(_OSX_MIN_VERSION) \
                -B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
                -isysroot$(OSX_SDK) -nostdlibinc \
                -iwithsysroot/usr/include/c++/v1 \

However, the underlying issue still needs to be investigated further.

fanquake · 2023-11-02T11:46:52Z

The following patch fixes the Qt build for me:

We wont be taking that patch, but if the problem is that qt fails to respect -mmacosx-version-min for some reason, I would assume that should make it fairly obvious where the problem is.

TheCharlatan

ACK 8ea45e6

Get the same build hashes and SDK hashes. Ran the binary on macOS 11.1. Completed a depends build on my linux dev box. Verified the boost process patch.

8047bb6 build: Update `qt` package up to 5.15.11 (Hennadii Stepanov) Pull request description: In the light of bitcoin#28622, we probably have to patch Qt. It seems reasonable to update it up to the latest available version before doing that. ACKs for top commit: TheCharlatan: ACK 8047bb6 Tree-SHA512: b4d7df2ff059b8f58c3202d913237c0d39a962748658f1ce853884dca095fbda5f56d4d68f73a1bc8da2f295e96a20927306e148b41a9f4afc42c8edb11c3729

includes: - 51c97ff

, bitcoin#25873, bitcoin#26557, bitcoin#25465, bitcoin#26952, bitcoin#25898:, bitcoin#30217, bitcoin#24266, partial bitcoin#28622 (replace boost::filesystem with std::filesystem: part 2) f4b896e merge bitcoin#24266: Avoid buggy std::filesystem:::create_directories() call (Kittywhiskers Van Gogh) b02d5e3 merge bitcoin#30217: Update Boost download link (Kittywhiskers Van Gogh) 9e80893 partial bitcoin#28622: use macOS 14 SDK (Xcode 15.0) (Kittywhiskers Van Gogh) 05fb206 merge bitcoin#25898: remove WSL 1 workaround in fs (Kittywhiskers Van Gogh) da5b433 merge bitcoin#26952: Avoid `BOOST_NO_CXX98_FUNCTION_BASE` macro redefinition (Kittywhiskers Van Gogh) 7a1f48e merge bitcoin#25465: remove boost library detection (Kittywhiskers Van Gogh) 1d8b890 merge bitcoin#26557: Update Boost to 1.81.0 in depends (Kittywhiskers Van Gogh) 1ad64da merge bitcoin#25873: Boost 1.80.0 (Kittywhiskers Van Gogh) d2c968b merge bitcoin#25808: work around u8path deprecated-declaration warnings with libc++ (Kittywhiskers Van Gogh) aa361b2 merge bitcoin#24301: header-only Boost (Kittywhiskers Van Gogh) 357d1b6 merge bitcoin#24252: Represent paths with fs::path instead of std::string (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Depends on #6138 ## Breaking Changes None observed. ## Checklist: - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK f4b896e Tree-SHA512: a23b97a4e2ff5749b8b964a76fab40aa670d1b2c43debdd125d9a747f7e411523b080dc222ef5e2c6dcd9b190afd757392c33eb9e003dc1408d33f52b2e0ecb6

…properly 05aca09 build: Patch Qt to handle minimum macOS version properly (Hennadii Stepanov) Pull request description: This PR is: - required to [switch](bitcoin#28622) to macOS 14 SDK (Xcode 15). - an alternative to bitcoin#28732 and bitcoin#28775. Qt relies on the `__MAC_OS_X_VERSION_MIN_REQUIRED` macro, which is set in the `AvailabilityInternal.h` SDK header to the value provided by the Clang driver from the `-mmacos-version-min` / `-mmacosx-version-min` option. Xcode 12 SDK expects the OS-specific `__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__` macro: ```c++ #ifndef __MAC_OS_X_VERSION_MIN_REQUIRED #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ /* compiler for Mac OS X sets __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ */ #define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ #endif #endif /* __MAC_OS_X_VERSION_MIN_REQUIRED*/ ``` In the other hand, Xcode 15 SDK expects a general `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` macro: ```c++ #ifndef __MAC_OS_X_VERSION_MIN_REQUIRED #if defined(__has_builtin) && __has_builtin(__is_target_os) #if __is_target_os(macos) #define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ #define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_14_0 #endif #elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ #define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ #define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_14_0 #endif /* __has_builtin(__is_target_os) && __is_target_os(macos) */ #endif /* __MAC_OS_X_VERSION_MIN_REQUIRED */ ``` The latter macro is not provided by LLVM Clang until llvm/llvm-project@c8e2dd8, which is available in Clang 17. The suggested patch makes Qt "borrow" the `__MAC_OS_X_VERSION_MIN_REQUIRED` value from `MAC_OS_X_VERSION_MIN_REQUIRED`, which is set in the `AvailabilityMacros.h` SDK header. ACKs for top commit: maflcko: lgtm ACK 05aca09 Tree-SHA512: 8891aefde4b8a48885abf0648f4ec71a22f7fcfca1e17ebb8c70ce1ef44751ea5db6b8b652de6ee8a716ca5f96f720fef01600bc23986162d0146c946e2e8743

continuation of 9e80893 from dash#6150

, bitcoin#28622, bitcoin#28880, bitcoin#29185, bitcoin#29170, bitcoin#29233, bitcoin#29298, bitcoin#29598, bitcoin#29732, bitcoin#29890, bitcoin#29739, bitcoin#30074, bitcoin#30198, bitcoin#29072 (toolchain backports: part 2) 1506d9d merge bitcoin#29072: use `-no_exported_symbols` on macOS (Kittywhiskers Van Gogh) 9247960 merge bitcoin#30198: qt 5.15.14 and fix macOS build with Clang 18 (Kittywhiskers Van Gogh) 5585e7a merge bitcoin#30074: use ENV flags in get_arch (Kittywhiskers Van Gogh) decd420 merge bitcoin#29739: swap cctools otool for llvm-objdump (Kittywhiskers Van Gogh) 0f8c420 merge bitcoin#29890: remove some tools when cross-compiling for macOS (Kittywhiskers Van Gogh) 936da1a merge bitcoin#29732: qt 5.15.13 (Kittywhiskers Van Gogh) c294b47 revert: patch qt to make placeholders differ from actual text (Kittywhiskers Van Gogh) af7090c merge bitcoin#29598: don't use -h with touch on OpenBSD (Kittywhiskers Van Gogh) ebf8ff2 merge bitcoin#29298: patch libtool out of libnatpmp/miniupnpc (Kittywhiskers Van Gogh) 070b876 merge bitcoin#29233: depends move macOS C(XX) FLAGS out of C & CXX (Kittywhiskers Van Gogh) d838481 revert dash#2398: Force fvisibility=hidden when compiling on macos (Kittywhiskers Van Gogh) 59a18f9 merge bitcoin#29170: add macho branch protection check (Kittywhiskers Van Gogh) cb024d9 merge bitcoin#29185: remove `--enable-lto` (Kittywhiskers Van Gogh) 6d75a81 merge bitcoin#28880: switch to using LLVM 17.x for macOS builds (Kittywhiskers Van Gogh) 7b0a1f2 merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0) (Kittywhiskers Van Gogh) 02eb735 merge bitcoin#24948: fix typo in permissions (Kittywhiskers Van Gogh) 2739107 merge bitcoin#24534: make gen-sdk deterministic (Kittywhiskers Van Gogh) ab10bf9 merge bitcoin#24241: cleanup doc on need of Developer Account to obtain macOS SDK (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependent on #6384 * Dependency for #6389 * The Qt patch introduced in [dash#5596](#5596), `fix_qt_placeholders.patch`, was a portion of a suggested workaround for QTBUG-92199 ([source](https://bugreports.qt.io/browse/QTBUG-92199?focusedId=669719&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-669719)) but since then, a fix ([here](https://codereview.qt-project.org/c/qt/qtbase/+/434310)) has made its way to 5.15.12 and we are upgrading to 5.15.14 from 5.15.11. So we can safely remove this patch. ## Breaking Changes None expected ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 1506d9d PastaPastaPasta: utACK 1506d9d Tree-SHA512: df8e4ea0ce9e7b269d248518698f0566b5eca1a54cdfb53f5b213b90fb5177e5a5df44eaeb6f3fc014cd93351c9245736bb2fd52bc2af4ae274d8fa93e601b07

Summary: Backport of [[bitcoin/bitcoin#28622 | core#28622]]. Depends on D17212. Test Plan: Run the guix osx build Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D17213

fanquake added this to the 27.0 milestone Oct 9, 2023

DrahtBot added the Build system label Oct 9, 2023

maflcko added the DrahtBot Guix build requested label Oct 9, 2023

DrahtBot added the CI failed label Oct 9, 2023

DrahtBot mentioned this pull request Oct 10, 2023

depends: update LD64_VERSION to 711 #28630

Merged

maflcko removed the DrahtBot Guix build requested label Oct 11, 2023

Sjors reviewed Oct 12, 2023

View reviewed changes

contrib/macdeploy/README.md Show resolved Hide resolved

contrib/macdeploy/README.md Outdated Show resolved Hide resolved

maflcko mentioned this pull request Oct 16, 2023

miniscript: make operator""_mst consteval #28657

Merged

DrahtBot added the Needs rebase label Oct 16, 2023

fanquake force-pushed the macos_sdk_15 branch from bbc4d25 to 4f8a516 Compare October 17, 2023 09:13

DrahtBot removed the Needs rebase label Oct 17, 2023

fanquake force-pushed the macos_sdk_15 branch 2 times, most recently from b7df682 to f638625 Compare October 17, 2023 13:10

fanquake force-pushed the macos_sdk_15 branch from f638625 to d9271fe Compare October 23, 2023 12:51

hebasto reviewed Oct 25, 2023

View reviewed changes

contrib/macdeploy/gen-sdk Outdated Show resolved Hide resolved

hebasto mentioned this pull request Oct 25, 2023

build: Bump native_clang up to 17.0.2 #28732

Closed

fanquake force-pushed the macos_sdk_15 branch from d9271fe to 89720d8 Compare October 30, 2023 16:35

hebasto mentioned this pull request Nov 1, 2023

build: Update qt package up to 5.15.11 #28769

Merged

fanquake requested a review from TheCharlatan December 6, 2023 16:53

TheCharlatan approved these changes Dec 6, 2023

View reviewed changes

fanquake merged commit dce1dfb into bitcoin:master Dec 7, 2023
16 checks passed

fanquake deleted the macos_sdk_15 branch December 7, 2023 10:01

maflcko mentioned this pull request Dec 14, 2023

build: Require libc++-16 or later #29077

Closed

kwvg added a commit to kwvg/dash that referenced this pull request Jul 24, 2024

partial bitcoin#28622: use macOS 14 SDK (Xcode 15.0)

8d10928

includes: - 51c97ff

kwvg added a commit to kwvg/dash that referenced this pull request Aug 7, 2024

partial bitcoin#28622: use macOS 14 SDK (Xcode 15.0)

1448b18

includes: - 51c97ff

kwvg added a commit to kwvg/dash that referenced this pull request Aug 10, 2024

partial bitcoin#28622: use macOS 14 SDK (Xcode 15.0)

03415ab

includes: - 51c97ff

PastaPastaPasta pushed a commit to kwvg/dash that referenced this pull request Aug 13, 2024

partial bitcoin#28622: use macOS 14 SDK (Xcode 15.0)

9e80893

includes: - 51c97ff

kwvg added a commit to kwvg/dash that referenced this pull request Nov 7, 2024

merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0)

b699922

continuation of 9e80893 from dash#6150

kwvg added a commit to kwvg/dash that referenced this pull request Nov 7, 2024

merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0)

9873e95

continuation of 9e80893 from dash#6150

kwvg added a commit to kwvg/dash that referenced this pull request Nov 15, 2024

merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0)

15aa30f

continuation of 9e80893 from dash#6150

kwvg added a commit to kwvg/dash that referenced this pull request Nov 16, 2024

merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0)

7b0a1f2

continuation of 9e80893 from dash#6150

bitcoin locked and limited conversation to collaborators Dec 6, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: use macOS 14 SDK (Xcode 15.0) #28622

build: use macOS 14 SDK (Xcode 15.0) #28622

fanquake commented Oct 9, 2023 •

edited

Loading

DrahtBot commented Oct 9, 2023 •

edited

Loading

hebasto commented Oct 9, 2023

maflcko commented Oct 9, 2023

hebasto commented Oct 9, 2023

fanquake commented Oct 17, 2023

Sjors commented Oct 23, 2023

josibake commented Oct 23, 2023

fanquake commented Oct 23, 2023

fanquake commented Oct 30, 2023

hebasto commented Nov 2, 2023

fanquake commented Nov 2, 2023

TheCharlatan left a comment

build: use macOS 14 SDK (Xcode 15.0) #28622

build: use macOS 14 SDK (Xcode 15.0) #28622

Conversation

fanquake commented Oct 9, 2023 • edited Loading

DrahtBot commented Oct 9, 2023 • edited Loading

Code Coverage

Reviews

Conflicts

hebasto commented Oct 9, 2023

maflcko commented Oct 9, 2023

hebasto commented Oct 9, 2023

fanquake commented Oct 17, 2023

Sjors commented Oct 23, 2023

josibake commented Oct 23, 2023

fanquake commented Oct 23, 2023

fanquake commented Oct 30, 2023

hebasto commented Nov 2, 2023

fanquake commented Nov 2, 2023

TheCharlatan left a comment

Choose a reason for hiding this comment

fanquake commented Oct 9, 2023 •

edited

Loading

DrahtBot commented Oct 9, 2023 •

edited

Loading