From 0263c42555fe4cf9a368dec41cc12f4fc54c73ee Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 19 Oct 2024 09:42:29 +0000 Subject: [PATCH] ALL: Various toolchains updates --- Makefile | 2 +- buildbot-config/platforms.py | 4 ++-- toolchains/apple-common/packages/cctools-port/build.sh | 2 +- toolchains/apple-common/packages/osxcross-clang/build.sh | 2 +- toolchains/apple-common/packages/osxcross/build.sh | 2 +- toolchains/apple-sdks/Dockerfile.m4 | 2 +- toolchains/apple-sdks/packages/xcode-extractor/build.sh | 2 +- .../patches/0003-Generate-all-SDKs-and-not-only-MacOSX.patch | 2 +- toolchains/appletv/Dockerfile.m4 | 2 +- toolchains/common/packages/libsdl1.2/build.sh | 2 +- toolchains/common/packages/sonivox/build.sh | 4 ++-- toolchains/iphone/Dockerfile.m4 | 2 +- toolchains/m4/debian-toolchain-base.m4 | 2 +- toolchains/macosx-arm64/Dockerfile.m4 | 4 ++-- toolchains/macosx-x86_64/Dockerfile.m4 | 4 ++-- toolchains/mxe/Dockerfile.m4 | 2 +- toolchains/psp/packages/psp-packages/build.sh | 2 +- toolchains/psp/packages/toolchain/build.sh | 2 +- toolchains/riscos/packages/toolchain/build.sh | 2 +- workers/appletv/Dockerfile.m4 | 2 +- workers/iphone/Dockerfile.m4 | 2 +- workers/m4/debian-builder-base.m4 | 2 +- workers/macosx-arm64/Dockerfile.m4 | 4 ++-- workers/macosx-x86_64/Dockerfile.m4 | 4 ++-- 24 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 78e8777..d7c0a6e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BUILDBOT_VERSION := 4.1.0 BUILDBOT_BASEDIR := buildbot-workdir -BOTTLE_VERSION := 0.13.1 +BOTTLE_VERSION := 0.13.2 DOCKER_PY_VERSION := 7.1.0 # Without toolchains/ part, all is a placeholder for all detected toolchains diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py index 145e86d..e44be1d 100644 --- a/buildbot-config/platforms.py +++ b/buildbot-config/platforms.py @@ -417,7 +417,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-darwin23.5") + platform.configureargs.append("--host=aarch64-apple-darwin24") platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-static", "--with-staticlib-prefix=${DESTDIR}/${PREFIX}", @@ -458,7 +458,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-darwin23.5") + platform.configureargs.append("--host=x86_64-apple-darwin24") platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-static", "--with-staticlib-prefix=${DESTDIR}/${PREFIX}", diff --git a/toolchains/apple-common/packages/cctools-port/build.sh b/toolchains/apple-common/packages/cctools-port/build.sh index 343bd8e..cd158dc 100755 --- a/toolchains/apple-common/packages/cctools-port/build.sh +++ b/toolchains/apple-common/packages/cctools-port/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -CCTOOLS_PORT_VERSION=b65b36cca9c2ec07c8895d805c6115611563cce0 +CCTOOLS_PORT_VERSION=a2724f04cafe3590fbc3d0beacc37293d83a2177 export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) diff --git a/toolchains/apple-common/packages/osxcross-clang/build.sh b/toolchains/apple-common/packages/osxcross-clang/build.sh index 42fe020..29ef50f 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=be6ffb3cbc6c0228614ebe6a4b5cd2726339ecc9 +OSXCROSS_VERSION=29fe6dd35522073c9df5800f8cd1feb4b9a993a8 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 113b1ed..8df184e 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=be6ffb3cbc6c0228614ebe6a4b5cd2726339ecc9 +OSXCROSS_VERSION=29fe6dd35522073c9df5800f8cd1feb4b9a993a8 export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) diff --git a/toolchains/apple-sdks/Dockerfile.m4 b/toolchains/apple-sdks/Dockerfile.m4 index 2d303b7..7b7ab34 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', 15.4) +m4_define(`XCODE_VERSION', 16.0) 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 5531bac..a3ccec3 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=be6ffb3cbc6c0228614ebe6a4b5cd2726339ecc9 +OSXCROSS_VERSION=29fe6dd35522073c9df5800f8cd1feb4b9a993a8 export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53 export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497 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 c682092..5b49843 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 @@ -26,7 +26,7 @@ index f29faec..d554c9d 100755 fi --SDKS=$(ls | grep -E "^MacOSX14.*|^MacOSX13.*|^MacOSX12.*|^MacOSX11.*|^MacOSX10.*" | grep -v "Patch") +-SDKS=$(ls | grep -E "^MacOSX15.*|^MacOSX14.*|^MacOSX13.*|^MacOSX12.*|^MacOSX11.*|^MacOSX10.*" | grep -v "Patch") +SDKS=$(for platform in $SDK_PLATFORMS; do ls -1d ${platform}.platform/Developer/SDKs/*.*.sdk | grep -v 'Patch'; done) if [ -z "$SDKS" ]; then diff --git a/toolchains/appletv/Dockerfile.m4 b/toolchains/appletv/Dockerfile.m4 index 7206a76..67dc765 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',-18)m4_dnl -m4_define(`XOS_SDK_VERSION',17.5)m4_dnl +m4_define(`XOS_SDK_VERSION',18.0)m4_dnl m4_define(`XOS_DEPLOYMENT_TARGET',9.0)m4_dnl m4_define(`XOS_SDK_BASE',AppleTVOS)m4_dnl diff --git a/toolchains/common/packages/libsdl1.2/build.sh b/toolchains/common/packages/libsdl1.2/build.sh index ee2609d..e22292e 100755 --- a/toolchains/common/packages/libsdl1.2/build.sh +++ b/toolchains/common/packages/libsdl1.2/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -SDL_VERSION=a1233230c9c5d0800054f49964a3cf519d61655b +SDL_VERSION=2a0b7429ac1624e45b155e3f27822595e9ef686c PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/common/packages/sonivox/build.sh b/toolchains/common/packages/sonivox/build.sh index 90c1f48..3f39d4e 100755 --- a/toolchains/common/packages/sonivox/build.sh +++ b/toolchains/common/packages/sonivox/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -SONIVOX_VERSION=3.6.12 +SONIVOX_VERSION=3.6.14 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. @@ -13,7 +13,7 @@ do_http_fetch sonivox \ # -DCMAKE_SYSTEM_NAME=Windows for Windows -do_cmake -DBUILD_SONIVOX_SHARED=OFF -DBUILD_TESTING=OFF "$@" +do_cmake -DBUILD_SONIVOX_SHARED=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLE=OFF "$@" do_make do_make install diff --git a/toolchains/iphone/Dockerfile.m4 b/toolchains/iphone/Dockerfile.m4 index ea8c1b9..4036014 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',-18)m4_dnl -m4_define(`XOS_SDK_VERSION',17.5)m4_dnl +m4_define(`XOS_SDK_VERSION',18.0)m4_dnl m4_define(`XOS_DEPLOYMENT_TARGET',7.0)m4_dnl m4_define(`XOS_SDK_BASE',iPhoneOS)m4_dnl diff --git a/toolchains/m4/debian-toolchain-base.m4 b/toolchains/m4/debian-toolchain-base.m4 index cb514de..ab51136 100644 --- a/toolchains/m4/debian-toolchain-base.m4 +++ b/toolchains/m4/debian-toolchain-base.m4 @@ -1,5 +1,5 @@ m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)') -m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240904)') +m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20241016)') FROM toolchains/common AS helpers FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,) diff --git a/toolchains/macosx-arm64/Dockerfile.m4 b/toolchains/macosx-arm64/Dockerfile.m4 index 82cac26..f94be58 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',-18)m4_dnl -m4_define(`MACOSX_SDK_VERSION',14.5)m4_dnl +m4_define(`MACOSX_SDK_VERSION',15.0)m4_dnl m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',23.5)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',24)m4_dnl m4_define(`MACOSX_DEPLOYMENT_TARGET',12.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 7846b67..6c2dcf9 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',-18)m4_dnl -m4_define(`MACOSX_SDK_VERSION',14.5)m4_dnl +m4_define(`MACOSX_SDK_VERSION',15.0)m4_dnl m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',23.5)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',24)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/toolchains/mxe/Dockerfile.m4 b/toolchains/mxe/Dockerfile.m4 index ac86040..008c9ec 100644 --- a/toolchains/mxe/Dockerfile.m4 +++ b/toolchains/mxe/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`MXE_VERSION',c5ebc8ad5678adf5c4cb504e4f1496264d4f46f8)m4_dnl +m4_define(`MXE_VERSION',d6377b2f2334694dbb040294fd0d848327e63328)m4_dnl m4_include(`paths.m4')m4_dnl m4_include(`packages.m4')m4_dnl diff --git a/toolchains/psp/packages/psp-packages/build.sh b/toolchains/psp/packages/psp-packages/build.sh index c2969e5..6559eb1 100755 --- a/toolchains/psp/packages/psp-packages/build.sh +++ b/toolchains/psp/packages/psp-packages/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -PSP_PACKAGES_VERSION=69fbfebb82f68dda59a821fc5456fb51f786c852 +PSP_PACKAGES_VERSION=dd17a8caccdd90b1e73ead5b5c7e91674061c59c PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/psp/packages/toolchain/build.sh b/toolchains/psp/packages/toolchain/build.sh index 9badecb..aaf3d3c 100755 --- a/toolchains/psp/packages/toolchain/build.sh +++ b/toolchains/psp/packages/toolchain/build.sh @@ -2,7 +2,7 @@ PSPDEV_VERSION=f6977f7b749fec33aa44cac0cf07aed5b31d5d7b export PSPTOOLCHAIN_VERSION=a420edb56fd5e63f21a043748b14ea2c7925bb48 -export PSPSDK_VERSION=1a33b06ba3fc6478da987672011f5cb7e4a8347a +export PSPSDK_VERSION=9bf58639cc462b13f5bf95cc5f59aca9ea460cbf export PSPLINKUSB_VERSION=7d44fc10222df2d6f56d939ed4a15dc859651f4a export EBOOTSIGNER_VERSION=17d6386f034ac922f540ca78200961761b23ecae export PSPTOOLCHAIN_ALLEGREX_VERSION=e3e1bed110ff0b13f490873d0f83ecbff9cf27c7 diff --git a/toolchains/riscos/packages/toolchain/build.sh b/toolchains/riscos/packages/toolchain/build.sh index a227e67..45f9929 100755 --- a/toolchains/riscos/packages/toolchain/build.sh +++ b/toolchains/riscos/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -GCCSDK_VERSION=7797 +GCCSDK_VERSION=7800 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/workers/appletv/Dockerfile.m4 b/workers/appletv/Dockerfile.m4 index 93ebe24..9a0fb48 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',-18)m4_dnl -m4_define(`XOS_SDK_VERSION',17.5)m4_dnl +m4_define(`XOS_SDK_VERSION',18.0)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 6f2d005..ec94281 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',-18)m4_dnl -m4_define(`XOS_SDK_VERSION',17.5)m4_dnl +m4_define(`XOS_SDK_VERSION',18.0)m4_dnl m4_define(`XOS_DEPLOYMENT_TARGET',7.0)m4_dnl m4_define(`XOS_SDK_BASE',iPhoneOS)m4_dnl diff --git a/workers/m4/debian-builder-base.m4 b/workers/m4/debian-builder-base.m4 index c7d7546..44aa504 100644 --- a/workers/m4/debian-builder-base.m4 +++ b/workers/m4/debian-builder-base.m4 @@ -1,5 +1,5 @@ m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)') -m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240904)') +m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20241016)') m4_define(`BASE_DEBIAN',`')m4_dnl FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim USER root diff --git a/workers/macosx-arm64/Dockerfile.m4 b/workers/macosx-arm64/Dockerfile.m4 index 76037ff..7d1ea67 100644 --- a/workers/macosx-arm64/Dockerfile.m4 +++ b/workers/macosx-arm64/Dockerfile.m4 @@ -1,9 +1,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',-18)m4_dnl -m4_define(`MACOSX_SDK_VERSION',14.5)m4_dnl +m4_define(`MACOSX_SDK_VERSION',15.0)m4_dnl m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',23.5)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',24)m4_dnl m4_define(`MACOSX_DEPLOYMENT_TARGET',12.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 4825ac5..cc859b3 100644 --- a/workers/macosx-x86_64/Dockerfile.m4 +++ b/workers/macosx-x86_64/Dockerfile.m4 @@ -1,9 +1,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',-18)m4_dnl -m4_define(`MACOSX_SDK_VERSION',14.5)m4_dnl +m4_define(`MACOSX_SDK_VERSION',15.0)m4_dnl m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',23.5)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',24)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