diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py index af1003e..5177791 100644 --- a/buildbot-config/platforms.py +++ b/buildbot-config/platforms.py @@ -473,7 +473,7 @@ def macosx_arm64(): # configure script doesn't compile discord check with proper flags platform.env["DISCORD_LIBS"] = "-framework AppKit" - platform.configureargs.append("--host=aarch64-apple-darwin25.1") + platform.configureargs.append("--host=aarch64-apple-darwin25.2") platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-static", "--with-staticlib-prefix=${DESTDIR}/${PREFIX}", @@ -514,7 +514,7 @@ def macosx_x86_64(): # configure script doesn't compile discord check with proper flags platform.env["DISCORD_LIBS"] = "-framework AppKit" - platform.configureargs.append("--host=x86_64-apple-darwin25.1") + platform.configureargs.append("--host=x86_64-apple-darwin25.2") # Don't enable updates on x86_64 as the platform is getting older platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-static", diff --git a/toolchains/apple-common/packages/osxcross-clang/build.sh b/toolchains/apple-common/packages/osxcross-clang/build.sh index d99c164..a2965d1 100755 --- a/toolchains/apple-common/packages/osxcross-clang/build.sh +++ b/toolchains/apple-common/packages/osxcross-clang/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=121ce150c7857a9474dfff8a8e431482806b3e1b +OSXCROSS_VERSION=e6ab3fa7423f9235ce9ed6381d6d3af191b46b59 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/apple-common/packages/osxcross/build.sh b/toolchains/apple-common/packages/osxcross/build.sh index 88656c4..034efeb 100755 --- a/toolchains/apple-common/packages/osxcross/build.sh +++ b/toolchains/apple-common/packages/osxcross/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=121ce150c7857a9474dfff8a8e431482806b3e1b +OSXCROSS_VERSION=e6ab3fa7423f9235ce9ed6381d6d3af191b46b59 export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497 export LIBDISPATCH_VERSION=323b9b4e0ca05d6c56a0c2f2d7d8d47363e612b7 diff --git a/toolchains/apple-common/packages/osxcross/patches/0001-Set-versions.patch b/toolchains/apple-common/packages/osxcross/patches/0001-Set-versions.patch index fb26d2c..7da1096 100644 --- a/toolchains/apple-common/packages/osxcross/patches/0001-Set-versions.patch +++ b/toolchains/apple-common/packages/osxcross/patches/0001-Set-versions.patch @@ -1,7 +1,7 @@ -From 062777073b2f3251cf90d0769589f8b9d2a694ea Mon Sep 17 00:00:00 2001 +From 4259966fd86794730dd09d9cfd0590e712b4a3b4 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 24 Jan 2021 19:15:52 +0100 -Subject: [PATCH 1/5] Set versions +Subject: [PATCH 1/4] Set versions --- tools/tools.sh | 4 ++-- @@ -30,5 +30,5 @@ index f903f0b..12305ea 100644 if [ $f_res -eq 1 ]; then pushd $CURRENT_BUILD_PROJECT_NAME &>/dev/null -- -2.48.1 +2.51.2 diff --git a/toolchains/apple-common/packages/osxcross/patches/0003-Disable-ORC-which-uses-C-17-features-on-older-SDKs.patch b/toolchains/apple-common/packages/osxcross/patches/0002-Disable-ORC-which-uses-C-17-features-on-older-SDKs.patch similarity index 84% rename from toolchains/apple-common/packages/osxcross/patches/0003-Disable-ORC-which-uses-C-17-features-on-older-SDKs.patch rename to toolchains/apple-common/packages/osxcross/patches/0002-Disable-ORC-which-uses-C-17-features-on-older-SDKs.patch index 68e74c6..ba113ed 100644 --- a/toolchains/apple-common/packages/osxcross/patches/0003-Disable-ORC-which-uses-C-17-features-on-older-SDKs.patch +++ b/toolchains/apple-common/packages/osxcross/patches/0002-Disable-ORC-which-uses-C-17-features-on-older-SDKs.patch @@ -1,7 +1,7 @@ -From 6cc29752b76506be89987ac7d664530f61f23246 Mon Sep 17 00:00:00 2001 +From 7ad44a8625cea02b28e9ce81538562ca3cfb1cbe Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Tue, 25 Jun 2024 05:56:44 +0000 -Subject: [PATCH 3/5] Disable ORC which uses C++17 features on older SDKs +Subject: [PATCH 2/4] Disable ORC which uses C++17 features on older SDKs --- build_compiler_rt.sh | 6 ++++++ @@ -25,5 +25,5 @@ index 5ce8697..17c0e6c 100755 pushd $build_dir &>/dev/null -- -2.48.1 +2.51.2 diff --git a/toolchains/apple-common/packages/osxcross/patches/0002-Handle-MacPorts-variants.patch b/toolchains/apple-common/packages/osxcross/patches/0002-Handle-MacPorts-variants.patch deleted file mode 100644 index 900a865..0000000 --- a/toolchains/apple-common/packages/osxcross/patches/0002-Handle-MacPorts-variants.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7ffb02d472f5701fd17be062c2d5659a0bdd0f6d Mon Sep 17 00:00:00 2001 -From: Le Philousophe -Date: Sat, 17 Sep 2022 11:36:50 +0200 -Subject: [PATCH 2/5] Handle MacPorts variants - ---- - tools/osxcross-macports | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/tools/osxcross-macports b/tools/osxcross-macports -index cd8e7eb..f52e805 100755 ---- a/tools/osxcross-macports -+++ b/tools/osxcross-macports -@@ -277,13 +277,20 @@ verifyFileIntegrity() - - getPkgUrl() - { -- local pkgname="$1" -+ local pkgname="${1%+*}" -+ local pkgvariant="${1##*+}" - local pkgversion - local pkgs - local pkg - - set +e - -+ if [ "$pkgvariant" = "$1" ]; then -+ pkgvariant='[^+]*\.' -+ else -+ pkgvariant="+${pkgvariant}\\." -+ fi -+ - local pkg_info_url="https://ports.macports.org" - pkg_info_url+="/api/v1/ports/$pkgname/?format=json" - pkgversion=$(getFileStdout "$pkg_info_url" | \ -@@ -310,11 +317,11 @@ getPkgUrl() - done - - local pkg=$(echo "$pkgs" | \ -- grep "$pkgname-$pkgversion" | grep $OSXVERSION | grep $ARCH | \ -+ grep "${pkgname}-${pkgversion}_[0-9]\\+${pkgvariant}" | grep $OSXVERSION | grep $ARCH | \ - uniq | tail -n1) - if [ -z "$pkg" ]; then - pkg=$(echo "$pkgs" | \ -- grep "$pkgname-$pkgversion" | grep $OSXVERSION | grep "noarch" | \ -+ grep "${pkgname}-${pkgversion}_[0-9]\\+${pkgvariant}" | grep $OSXVERSION | grep "noarch" | \ - uniq | tail -n1) - fi - if [ -z "$pkg" ]; then --- -2.48.1 - diff --git a/toolchains/apple-common/packages/osxcross/patches/0004-Update-cctools-port-to-improve-compatibility.patch b/toolchains/apple-common/packages/osxcross/patches/0003-Update-cctools-port-to-improve-compatibility.patch similarity index 82% rename from toolchains/apple-common/packages/osxcross/patches/0004-Update-cctools-port-to-improve-compatibility.patch rename to toolchains/apple-common/packages/osxcross/patches/0003-Update-cctools-port-to-improve-compatibility.patch index 8f1851d..f41e36b 100644 --- a/toolchains/apple-common/packages/osxcross/patches/0004-Update-cctools-port-to-improve-compatibility.patch +++ b/toolchains/apple-common/packages/osxcross/patches/0003-Update-cctools-port-to-improve-compatibility.patch @@ -1,7 +1,7 @@ -From 7c3c611d9c02fecf3fe37d6db8d96db93364efec Mon Sep 17 00:00:00 2001 +From fec37db5a7ba74206f2daa3b68e7cfcf34ae149e Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Thu, 24 Apr 2025 08:31:19 +0200 -Subject: [PATCH 4/5] Update cctools-port to improve compatibility +Subject: [PATCH 3/4] Update cctools-port to improve compatibility Latest libraries from MacPorts need objc_msgSend support @@ -11,10 +11,10 @@ Latest cctools-port need libdispatch 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh -index b87522b..4bb1f8c 100755 +index 20f596d..db62505 100755 --- a/build.sh +++ b/build.sh -@@ -145,10 +145,24 @@ if [ $NEED_TAPI_SUPPORT -eq 1 ]; then +@@ -146,10 +146,24 @@ if [ $NEED_TAPI_SUPPORT -eq 1 ]; then fi fi @@ -41,7 +41,7 @@ index b87522b..4bb1f8c 100755 get_sources \ https://github.com/tpoechtrager/cctools-port.git \ -@@ -162,6 +176,7 @@ if [ $f_res -eq 1 ]; then +@@ -163,6 +177,7 @@ if [ $f_res -eq 1 ]; then if [ $NEED_TAPI_SUPPORT -eq 1 ]; then CONFFLAGS+="--with-libtapi=$TARGET_DIR " fi @@ -50,5 +50,5 @@ index b87522b..4bb1f8c 100755 [ -n "$DISABLE_CLANG_AS" ] && CONFFLAGS+="--disable-clang-as " [ -n "$DISABLE_LTO_SUPPORT" ] && CONFFLAGS+="--disable-lto-support " -- -2.48.1 +2.51.2 diff --git a/toolchains/apple-common/packages/osxcross/patches/0005-Fix-build-on-MacOS-i386.patch b/toolchains/apple-common/packages/osxcross/patches/0004-Fix-build-on-MacOS-i386.patch similarity index 94% rename from toolchains/apple-common/packages/osxcross/patches/0005-Fix-build-on-MacOS-i386.patch rename to toolchains/apple-common/packages/osxcross/patches/0004-Fix-build-on-MacOS-i386.patch index 8f6985d..5ceca4a 100644 --- a/toolchains/apple-common/packages/osxcross/patches/0005-Fix-build-on-MacOS-i386.patch +++ b/toolchains/apple-common/packages/osxcross/patches/0004-Fix-build-on-MacOS-i386.patch @@ -1,7 +1,7 @@ -From 716cfe22487980cf51e46d66296a9f9b70b1221e Mon Sep 17 00:00:00 2001 +From 85ed97a1948a531d91b4bd32a84657cb49889400 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 2 Nov 2025 18:51:37 +0100 -Subject: [PATCH 5/5] Fix build on MacOS i386 +Subject: [PATCH 4/4] Fix build on MacOS i386 --- build_compiler_rt.sh | 6 ++++++ @@ -47,5 +47,5 @@ index 0000000..aaea5a2 + #if !SANITIZER_WINDOWS + // No ssize_t on Windows. -- -2.48.1 +2.51.2 diff --git a/toolchains/apple-sdks/Dockerfile.m4 b/toolchains/apple-sdks/Dockerfile.m4 index 827b837..6205cf4 100644 --- a/toolchains/apple-sdks/Dockerfile.m4 +++ b/toolchains/apple-sdks/Dockerfile.m4 @@ -26,7 +26,7 @@ COPY Xcode_`'I386_XCODE_VERSION.xip* ${PACKAGES_LOCATION} local_package(xcode-extractor, , PACKAGE=Xcode_`'I386_XCODE_VERSION.xip SDK_PLATFORMS="MacOSX") # Extract latest MacOS X, AppleTVOS and iPhoneOS SDK -m4_define(`XCODE_VERSION', 26.1) +m4_define(`XCODE_VERSION', 26.2) COPY Xcode_`'XCODE_VERSION.xip* ${PACKAGES_LOCATION} local_package(xcode-extractor, , PACKAGE=Xcode_`'XCODE_VERSION.xip SDK_PLATFORMS="MacOSX iPhoneOS AppleTVOS") diff --git a/toolchains/apple-sdks/packages/xcode-extractor/build.sh b/toolchains/apple-sdks/packages/xcode-extractor/build.sh index 303f9b0..2d98d4d 100755 --- a/toolchains/apple-sdks/packages/xcode-extractor/build.sh +++ b/toolchains/apple-sdks/packages/xcode-extractor/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=121ce150c7857a9474dfff8a8e431482806b3e1b +OSXCROSS_VERSION=e6ab3fa7423f9235ce9ed6381d6d3af191b46b59 export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53 export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497 diff --git a/toolchains/apple-sdks/packages/xcode-extractor/patches/0001-Set-versions.patch b/toolchains/apple-sdks/packages/xcode-extractor/patches/0001-Set-versions.patch index a312641..628b790 100644 --- a/toolchains/apple-sdks/packages/xcode-extractor/patches/0001-Set-versions.patch +++ b/toolchains/apple-sdks/packages/xcode-extractor/patches/0001-Set-versions.patch @@ -1,4 +1,4 @@ -From 1fd0e5e6036db5d43ab571ff0f6da0f50bb51a66 Mon Sep 17 00:00:00 2001 +From 8bec84e583e2e360d6bd0054225ca309620ba839 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 24 Jan 2021 19:15:52 +0100 Subject: [PATCH 1/3] Set versions @@ -30,5 +30,5 @@ index f903f0b..12305ea 100644 if [ $f_res -eq 1 ]; then pushd $CURRENT_BUILD_PROJECT_NAME &>/dev/null -- -2.49.1 +2.51.2 diff --git a/toolchains/apple-sdks/packages/xcode-extractor/patches/0002-Accept-piped-data-and-avoid-intermediate-files.patch b/toolchains/apple-sdks/packages/xcode-extractor/patches/0002-Accept-piped-data-and-avoid-intermediate-files.patch index 917533e..2ceb7af 100644 --- a/toolchains/apple-sdks/packages/xcode-extractor/patches/0002-Accept-piped-data-and-avoid-intermediate-files.patch +++ b/toolchains/apple-sdks/packages/xcode-extractor/patches/0002-Accept-piped-data-and-avoid-intermediate-files.patch @@ -1,4 +1,4 @@ -From 2c45219b39e5e60043e52c19c5645bea4c79efb4 Mon Sep 17 00:00:00 2001 +From efae670e4b1ccd64576b71933d8e2b8676cbd866 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 24 Jan 2021 19:18:24 +0100 Subject: [PATCH 2/3] Accept piped data and avoid intermediate files @@ -338,5 +338,5 @@ index 12305ea..25492c4 100644 if [ $f_res -eq 1 ]; then pushd $CURRENT_BUILD_PROJECT_NAME &>/dev/null -- -2.49.1 +2.51.2 diff --git a/toolchains/apple-sdks/packages/xcode-extractor/patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch b/toolchains/apple-sdks/packages/xcode-extractor/patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch index c30fa3f..873469f 100644 --- a/toolchains/apple-sdks/packages/xcode-extractor/patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch +++ b/toolchains/apple-sdks/packages/xcode-extractor/patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch @@ -1,4 +1,4 @@ -From 130429671a25d35be0fc88dddae11d9321d1b168 Mon Sep 17 00:00:00 2001 +From 4e3847babce15dd8ad9efa88408cb3c33f2428bf Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 30 Aug 2025 17:58:44 +0200 Subject: [PATCH 3/3] Generate all SDKs and not only MacOSX @@ -63,5 +63,5 @@ index fc24005..a240379 100755 -ls -lh | grep MacOSX +ls -lh *.*.sdk.* -- -2.49.1 +2.51.2 diff --git a/toolchains/appletv/Dockerfile.m4 b/toolchains/appletv/Dockerfile.m4 index 28d33fd..43157fe 100644 --- a/toolchains/appletv/Dockerfile.m4 +++ b/toolchains/appletv/Dockerfile.m4 @@ -1,6 +1,6 @@ m4_dnl These settings must be kept in sync between toolchain and worker m4_define(`PPA_CLANG',-21)m4_dnl -m4_define(`XOS_SDK_VERSION',26.1)m4_dnl +m4_define(`XOS_SDK_VERSION',26.2)m4_dnl m4_define(`XOS_DEPLOYMENT_TARGET',9.0)m4_dnl m4_define(`XOS_SDK_BASE',AppleTVOS)m4_dnl diff --git a/toolchains/iphone/Dockerfile.m4 b/toolchains/iphone/Dockerfile.m4 index bcbcb10..07436eb 100644 --- a/toolchains/iphone/Dockerfile.m4 +++ b/toolchains/iphone/Dockerfile.m4 @@ -1,6 +1,6 @@ m4_dnl These settings must be kept in sync between toolchain and worker m4_define(`PPA_CLANG',-21)m4_dnl -m4_define(`XOS_SDK_VERSION',26.1)m4_dnl +m4_define(`XOS_SDK_VERSION',26.2)m4_dnl m4_define(`XOS_DEPLOYMENT_TARGET',7.0)m4_dnl m4_define(`XOS_SDK_BASE',iPhoneOS)m4_dnl diff --git a/toolchains/macosx-arm64/Dockerfile.m4 b/toolchains/macosx-arm64/Dockerfile.m4 index 751ab9d..2a3e06c 100644 --- a/toolchains/macosx-arm64/Dockerfile.m4 +++ b/toolchains/macosx-arm64/Dockerfile.m4 @@ -1,8 +1,8 @@ m4_dnl These settings must be kept in sync between toolchain and worker m4_define(`PPA_CLANG',-21)m4_dnl -m4_define(`MACOSX_SDK_VERSION',26.1)m4_dnl +m4_define(`MACOSX_SDK_VERSION',26.2)m4_dnl m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',25.1)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',25.2)m4_dnl m4_define(`MACOSX_DEPLOYMENT_TARGET',13.0)m4_dnl m4_define(`MACOSX_ARCHITECTURES',`arm64')m4_dnl m4_define(`MACOSX_PORTS_ARCH_ARG',`--arm64')m4_dnl diff --git a/toolchains/macosx-x86_64/Dockerfile.m4 b/toolchains/macosx-x86_64/Dockerfile.m4 index 9b615ec..c167b4d 100644 --- a/toolchains/macosx-x86_64/Dockerfile.m4 +++ b/toolchains/macosx-x86_64/Dockerfile.m4 @@ -1,8 +1,8 @@ m4_dnl These settings must be kept in sync between toolchain and worker m4_define(`PPA_CLANG',-21)m4_dnl -m4_define(`MACOSX_SDK_VERSION',26.1)m4_dnl +m4_define(`MACOSX_SDK_VERSION',26.2)m4_dnl m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',25.1)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',25.2)m4_dnl m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl diff --git a/workers/appletv/Dockerfile.m4 b/workers/appletv/Dockerfile.m4 index 20141ba..8246114 100644 --- a/workers/appletv/Dockerfile.m4 +++ b/workers/appletv/Dockerfile.m4 @@ -2,7 +2,7 @@ FROM toolchains/appletv AS toolchain m4_dnl These settings must be kept in sync between toolchain and worker m4_define(`PPA_CLANG',-21)m4_dnl -m4_define(`XOS_SDK_VERSION',26.1)m4_dnl +m4_define(`XOS_SDK_VERSION',26.2)m4_dnl m4_define(`XOS_DEPLOYMENT_TARGET',9.0)m4_dnl m4_define(`XOS_SDK_BASE',AppleTVOS)m4_dnl diff --git a/workers/iphone/Dockerfile.m4 b/workers/iphone/Dockerfile.m4 index d3b0243..a721e0a 100644 --- a/workers/iphone/Dockerfile.m4 +++ b/workers/iphone/Dockerfile.m4 @@ -2,7 +2,7 @@ FROM toolchains/iphone AS toolchain m4_dnl These settings must be kept in sync between toolchain and worker m4_define(`PPA_CLANG',-21)m4_dnl -m4_define(`XOS_SDK_VERSION',26.1)m4_dnl +m4_define(`XOS_SDK_VERSION',26.2)m4_dnl m4_define(`XOS_DEPLOYMENT_TARGET',7.0)m4_dnl m4_define(`XOS_SDK_BASE',iPhoneOS)m4_dnl diff --git a/workers/macosx-arm64/Dockerfile.m4 b/workers/macosx-arm64/Dockerfile.m4 index e6169af..fa55553 100644 --- a/workers/macosx-arm64/Dockerfile.m4 +++ b/workers/macosx-arm64/Dockerfile.m4 @@ -2,9 +2,9 @@ m4_define(`TOOLCHAIN',macosx-arm64)m4_dnl m4_dnl These settings must be kept in sync between toolchain and worker m4_define(`PPA_CLANG',-21)m4_dnl -m4_define(`MACOSX_SDK_VERSION',26.1)m4_dnl +m4_define(`MACOSX_SDK_VERSION',26.2)m4_dnl m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',25.1)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',25.2)m4_dnl m4_define(`MACOSX_DEPLOYMENT_TARGET',13.0)m4_dnl m4_define(`MACOSX_ARCHITECTURES',`arm64')m4_dnl m4_define(`MACOSX_PORTS_ARCH_ARG',`--arm64')m4_dnl diff --git a/workers/macosx-x86_64/Dockerfile.m4 b/workers/macosx-x86_64/Dockerfile.m4 index 2008ca2..985d644 100644 --- a/workers/macosx-x86_64/Dockerfile.m4 +++ b/workers/macosx-x86_64/Dockerfile.m4 @@ -2,9 +2,9 @@ m4_define(`TOOLCHAIN',macosx-x86_64)m4_dnl m4_dnl These settings must be kept in sync between toolchain and worker m4_define(`PPA_CLANG',-21)m4_dnl -m4_define(`MACOSX_SDK_VERSION',26.1)m4_dnl +m4_define(`MACOSX_SDK_VERSION',26.2)m4_dnl m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',25.1)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',25.2)m4_dnl m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl