diff --git a/assets/patches.txt b/assets/patches.txt index 1723a21..76d4dcc 100644 --- a/assets/patches.txt +++ b/assets/patches.txt @@ -11,6 +11,7 @@ patches/fullpage-translations-customization.patch patches/fullpage-translations.patch patches/hide-passwordmgr.patch patches/librewolf-prefs.patch +patches/macos-14.4-sdk.patch patches/mozilla_dirs.patch patches/msix.patch patches/remove_addons.patch diff --git a/patches/macos-14.4-sdk.patch b/patches/macos-14.4-sdk.patch index 863ece8..7db3e52 100644 --- a/patches/macos-14.4-sdk.patch +++ b/patches/macos-14.4-sdk.patch @@ -11,15 +11,25 @@ Differential Revision: https://phabricator.services.mozilla.com/D205627 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure -@@ -99,7 +99,7 @@ with only_when(host_is_osx | target_is_osx): - return Version(obj["Version"]) +@@ -95,17 +95,17 @@ with only_when(host_is_osx | target_is_o + option( + "--with-macos-sdk", + env="MACOS_SDK_DIR", + nargs=1, + help="Location of platform SDK to use", + ) - def sdk_min_version(): + def mac_sdk_min_version(): - return "14.2" + return "14.4" @depends( "--with-macos-sdk", + host, + bootstrap_path( + "MacOSX{}.sdk".format(mac_sdk_min_version()), + when=depends("--with-macos-sdk")(lambda x: not x), + allow_failure=True, diff --git a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist --- a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist +++ b/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist @@ -36,7 +46,12 @@ diff --git a/python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings. diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/macos-sdk.yml --- a/taskcluster/ci/toolchain/macos-sdk.yml +++ b/taskcluster/ci/toolchain/macos-sdk.yml -@@ -32,17 +32,17 @@ macosx64-sdk-13.3: +@@ -27,30 +27,30 @@ macosx64-sdk-13.3: + arguments: + - https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg + - 8de3306508dca31040b3b49ff370e96c94f4546bcf22cb4069abbb18e2d6bce8e20d40a6903f00ae75558175b624a979ea0444f54bc6d9d67e841f2000b0d863 + - Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk + toolchain-artifact: project/gecko/mac-sdk/MacOSX13.3.sdk.tar.zst toolchain-alias: - MacOSX13.3.sdk @@ -62,6 +77,14 @@ diff --git a/taskcluster/ci/toolchain/macos-sdk.yml b/taskcluster/ci/toolchain/m - macosx64-sdk-toolchain - - MacOSX14.2.sdk + - MacOSX14.4.sdk + + ios-sdk-17.4: + description: "iPhoneOS17.4 SDK" + treeherder: + symbol: TM(ios17.4) + # Because it's using an internal tooltool artifact, it can't be used as a local-toolchain for + # bootstrap. But we still want to use the same script as local-toolchains. + attributes: diff --git a/taskcluster/ci/toolchain/misc.yml b/taskcluster/ci/toolchain/misc.yml --- a/taskcluster/ci/toolchain/misc.yml +++ b/taskcluster/ci/toolchain/misc.yml