diff --git a/Makefile b/Makefile index 62f996e..7c8c21d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BUILDBOT_VERSION := 4.0.0 +BUILDBOT_VERSION := 4.0.2 BUILDBOT_BASEDIR := buildbot-workdir BOTTLE_VERSION := 0.12.25 diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py index 5fd2da7..ba94a78 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.6") + platform.configureargs.append("--host=aarch64-apple-darwin23.5") 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.6") + platform.configureargs.append("--host=x86_64-apple-darwin23.5") platform.buildconfigureargs = { builds.ScummVMBuild: [ "--enable-static", "--with-staticlib-prefix=${DESTDIR}/${PREFIX}", diff --git a/check-versions/config.py b/check-versions/config.py index 5d6dce8..ccd9475 100644 --- a/check-versions/config.py +++ b/check-versions/config.py @@ -33,7 +33,7 @@ VERSIONS_REGEXPS = [ cctools_port_check = { 'check': 'git commit', 'repository': 'https://github.com/tpoechtrager/cctools-port.git', - 'branch': '1009.2-ld64-907', + 'branch': '1010.6-ld64-951.9', } osxcross_check = { 'check': 'git commit', diff --git a/toolchains/amigaos4/packages/libsdl2/build.sh b/toolchains/amigaos4/packages/libsdl2/build.sh index 3d7b412..6e1faf6 100755 --- a/toolchains/amigaos4/packages/libsdl2/build.sh +++ b/toolchains/amigaos4/packages/libsdl2/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -SDL2_VERSION=2.30.1-release2 +SDL2_VERSION=2.30.5 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/apple-common/packages/cctools-port/build.sh b/toolchains/apple-common/packages/cctools-port/build.sh index 18ec5d3..3447e56 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=856d7d1bfcc890357bfe79b3f4aa206a0487b416 +CCTOOLS_PORT_VERSION=942b4fcf3c5dc0770d89b64fb33903123a1c92aa 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 90a3ef7..42fe020 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=fd32ecc6e0786369272be2da670bc9b5849b215a +OSXCROSS_VERSION=be6ffb3cbc6c0228614ebe6a4b5cd2726339ecc9 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 19c1b6f..113b1ed 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=fd32ecc6e0786369272be2da670bc9b5849b215a +OSXCROSS_VERSION=be6ffb3cbc6c0228614ebe6a4b5cd2726339ecc9 export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) 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 da5912c..9da434e 100644 --- a/toolchains/apple-common/packages/osxcross/patches/0001-Set-versions.patch +++ b/toolchains/apple-common/packages/osxcross/patches/0001-Set-versions.patch @@ -1,4 +1,4 @@ -From 55d50422830c14fbcf1ee86da8ce510ce4499abe Mon Sep 17 00:00:00 2001 +From 724d959c453225351db0ae849c0529d6fa6364a5 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 24 Jan 2021 19:15:52 +0100 Subject: [PATCH 1/2] Set versions @@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Set versions 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools.sh b/tools/tools.sh -index 1c6b499..a75b5e9 100644 +index f9d1806..7705916 100644 --- a/tools/tools.sh +++ b/tools/tools.sh @@ -512,7 +512,7 @@ function build_xar() @@ -30,5 +30,5 @@ index 1c6b499..a75b5e9 100644 if [ $f_res -eq 1 ]; then pushd $CURRENT_BUILD_PROJECT_NAME &>/dev/null -- -2.39.2 +2.43.0 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 index 0458fc1..4cfd7de 100644 --- a/toolchains/apple-common/packages/osxcross/patches/0002-Handle-MacPorts-variants.patch +++ b/toolchains/apple-common/packages/osxcross/patches/0002-Handle-MacPorts-variants.patch @@ -1,4 +1,4 @@ -From 8bc8d72d889e17ecaf50311a264e8a394c8f324b Mon Sep 17 00:00:00 2001 +From 73cc616854518cc9d5fc7bbb8485bd3fc4416dc2 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 17 Sep 2022 11:36:50 +0200 Subject: [PATCH 2/2] Handle MacPorts variants @@ -8,10 +8,10 @@ Subject: [PATCH 2/2] Handle MacPorts variants 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/osxcross-macports b/tools/osxcross-macports -index 3e87735..f388914 100755 +index cd8e7eb..f52e805 100755 --- a/tools/osxcross-macports +++ b/tools/osxcross-macports -@@ -275,13 +275,20 @@ verifyFileIntegrity() +@@ -277,13 +277,20 @@ verifyFileIntegrity() getPkgUrl() { @@ -33,7 +33,7 @@ index 3e87735..f388914 100755 local pkg_info_url="https://ports.macports.org" pkg_info_url+="/api/v1/ports/$pkgname/?format=json" pkgversion=$(getFileStdout "$pkg_info_url" | \ -@@ -308,11 +315,11 @@ getPkgUrl() +@@ -310,11 +317,11 @@ getPkgUrl() done local pkg=$(echo "$pkgs" | \ @@ -48,5 +48,5 @@ index 3e87735..f388914 100755 fi if [ -z "$pkg" ]; then -- -2.39.2 +2.43.0 diff --git a/toolchains/apple-common/packages/osxcross/patches/0003-Old-SDK-Build-compiler-rt.patch b/toolchains/apple-common/packages/osxcross/patches/0003-Old-SDK-Build-compiler-rt.patch index cd64c27..b8d5b13 100644 --- a/toolchains/apple-common/packages/osxcross/patches/0003-Old-SDK-Build-compiler-rt.patch +++ b/toolchains/apple-common/packages/osxcross/patches/0003-Old-SDK-Build-compiler-rt.patch @@ -2,7 +2,7 @@ diff --git a/build_compiler_rt.sh b/build_compiler_rt.sh index e0b6b91..6c07cf8 100755 --- a/build_compiler_rt.sh +++ b/build_compiler_rt.sh -@@ -172,6 +172,12 @@ if [ $f_res -eq 1 ]; then +@@ -179,6 +179,12 @@ if [ $f_res -eq 1 ]; then echo "" fi diff --git a/toolchains/apple-common/packages/osxcross/patches/0004-Update-compiler-rt-branches.patch b/toolchains/apple-common/packages/osxcross/patches/0004-Update-compiler-rt-branches.patch index 17906f0..38a8b3c 100644 --- a/toolchains/apple-common/packages/osxcross/patches/0004-Update-compiler-rt-branches.patch +++ b/toolchains/apple-common/packages/osxcross/patches/0004-Update-compiler-rt-branches.patch @@ -1,16 +1,13 @@ diff --git a/build_compiler_rt.sh b/build_compiler_rt.sh -index e0b6b91..7836709 100755 +index 3c6df7a..28721f7 100755 --- a/build_compiler_rt.sh +++ b/build_compiler_rt.sh -@@ -56,8 +56,9 @@ case $CLANG_VERSION in - 14.* ) BRANCH=release/14.x; USE_CMAKE=1; ;; +@@ -57,7 +57,7 @@ case $CLANG_VERSION in 15.* ) BRANCH=release/15.x; USE_CMAKE=1; ;; 16.* ) BRANCH=release/16.x; USE_CMAKE=1; ;; -- 17.* ) BRANCH=main; USE_CMAKE=1; ;; -- 18.* ) BRANCH=main; USE_CMAKE=1; ;; -+ 17.* ) BRANCH=release/17.x; USE_CMAKE=1; ;; + 17.* ) BRANCH=release/17.x; USE_CMAKE=1; ;; +- 18.* ) BRANCH=main; USE_CMAKE=1; ;; # Does not build with release/18.x + 18.* ) BRANCH=release/18.x; USE_CMAKE=1; ;; -+ 19.* ) BRANCH=main; USE_CMAKE=1; ;; - * ) echo "Unsupported Clang version, must be >= 3.2 and <= 18.0" 1>&2; exit 1; + 19.* ) BRANCH=main; USE_CMAKE=1; ;; + * ) echo "Unsupported Clang version, must be >= 3.2 and <= 19.0" 1>&2; exit 1; esac - diff --git a/toolchains/apple-sdks/packages/xcode-extractor/build.sh b/toolchains/apple-sdks/packages/xcode-extractor/build.sh index db1092a..5531bac 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=fd32ecc6e0786369272be2da670bc9b5849b215a +OSXCROSS_VERSION=be6ffb3cbc6c0228614ebe6a4b5cd2726339ecc9 export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53 export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497 diff --git a/toolchains/common/packages/fluidsynth/build.sh b/toolchains/common/packages/fluidsynth/build.sh index 27a7f82..4ac6d4b 100755 --- a/toolchains/common/packages/fluidsynth/build.sh +++ b/toolchains/common/packages/fluidsynth/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -FLUIDSYNTH_VERSION=2.3.5 +FLUIDSYNTH_VERSION=2.3.6 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/common/packages/libsdl1.2/build.sh b/toolchains/common/packages/libsdl1.2/build.sh index a209629..ee2609d 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=963bc45fc355423fed48c93df6b01b3b9ebfa15f +SDL_VERSION=a1233230c9c5d0800054f49964a3cf519d61655b PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/devkitppc/Dockerfile.m4 b/toolchains/devkitppc/Dockerfile.m4 index e2601cb..db004f1 100644 --- a/toolchains/devkitppc/Dockerfile.m4 +++ b/toolchains/devkitppc/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITPPC_VERSION',20240612) +m4_define(`DEVKITPPC_VERSION',20240702) # This version of devkitPPC depends on a Debian Bullseye # For now it works with our version, we will have to ensure it stays like that FROM devkitpro/devkitppc:DEVKITPPC_VERSION AS original-toolchain diff --git a/toolchains/devkitswitch/Dockerfile.m4 b/toolchains/devkitswitch/Dockerfile.m4 index c454cec..2c5d424 100644 --- a/toolchains/devkitswitch/Dockerfile.m4 +++ b/toolchains/devkitswitch/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITA64_VERSION',20240604) +m4_define(`DEVKITA64_VERSION',20240827) # This version of devkitA64 depends on a Debian Bullseye # For now it works with our version, we will have to ensure it stays like that FROM devkitpro/devkita64:DEVKITA64_VERSION AS original-toolchain diff --git a/toolchains/m4/debian-toolchain-base.m4 b/toolchains/m4/debian-toolchain-base.m4 index 1115a7a..78901a2 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',20240612)') +m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240812)') 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 b1b9c85..c85fed9 100644 --- a/toolchains/macosx-arm64/Dockerfile.m4 +++ b/toolchains/macosx-arm64/Dockerfile.m4 @@ -2,7 +2,7 @@ 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_TARGET_ARCH',aarch64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',23.6)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',23.5)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 61b3e74..aee05ab 100644 --- a/toolchains/macosx-x86_64/Dockerfile.m4 +++ b/toolchains/macosx-x86_64/Dockerfile.m4 @@ -2,7 +2,7 @@ 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_TARGET_ARCH',x86_64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',23.6)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',23.5)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 d88b68d..b08e70a 100644 --- a/toolchains/mxe/Dockerfile.m4 +++ b/toolchains/mxe/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`MXE_VERSION',e56eebec2a9f578c12a495851a76256d93b71ac0)m4_dnl +m4_define(`MXE_VERSION',9f349e0de62a4a68bfc0f13d835a6c685dae9daa)m4_dnl m4_include(`paths.m4')m4_dnl m4_include(`packages.m4')m4_dnl diff --git a/toolchains/opendingux-beta/packages/toolchain/build.sh b/toolchains/opendingux-beta/packages/toolchain/build.sh index 295ea90..707188d 100755 --- a/toolchains/opendingux-beta/packages/toolchain/build.sh +++ b/toolchains/opendingux-beta/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -TOOLCHAIN_VERSION=c2eda85b67bbd5a88f09cf639e24a8a207813a29 +TOOLCHAIN_VERSION=009f7e63571b290c81f2c20149a8e9cd0e814e80 TARGETS="gcw0 rs90 lepus" PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) diff --git a/toolchains/psp/packages/psp-packages/build.sh b/toolchains/psp/packages/psp-packages/build.sh index 68b854e..7772d70 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=daa27d42dde0c7e1ea115d7a264029896144b482 +PSP_PACKAGES_VERSION=058dfb2ba8ea58a272482a2bc79af1d6622cd41c 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 c115afc..5cdd39f 100755 --- a/toolchains/psp/packages/toolchain/build.sh +++ b/toolchains/psp/packages/toolchain/build.sh @@ -1,14 +1,14 @@ #! /bin/sh -PSPDEV_VERSION=8a5d35da2c3e0e4916e3a09f51a30717285bb3d6 +PSPDEV_VERSION=d1be8a70177d4c659fb6513e8ed2363acb1df360 export PSPTOOLCHAIN_VERSION=a420edb56fd5e63f21a043748b14ea2c7925bb48 -export PSPSDK_VERSION=5549b547607862407b6848d208bb553b9e1b36fa -export PSPLINKUSB_VERSION=7fc1352bc546701f49c9f33c501376ffad684188 +export PSPSDK_VERSION=d1d5dcf05d37fc6f7a147d1f8abb0d2c467f1a4d +export PSPLINKUSB_VERSION=00cd43b0ee41b5a037346616453abc7dffbb48d5 export EBOOTSIGNER_VERSION=17d6386f034ac922f540ca78200961761b23ecae -export PSPTOOLCHAIN_ALLEGREX_VERSION=cdfaf141b899030c1188f6ee67302e2a7a5cd39f +export PSPTOOLCHAIN_ALLEGREX_VERSION=6e225c051bbad644707dc428abe4a1957a8be469 export PSPTOOLCHAIN_EXTRA_VERSION=a9532d80f733088c781f711eceef6471a585193d export BINUTILS_VERSION=982f4d2cb190f0bce06a98e7556b1b20a256d826 -export GCC_VERSION=9dc41f8ec692e2028838f67676ba956be62c0896 +export GCC_VERSION=e8ee3aae2b5896b618464d155ed89d869ed5b110 export NEWLIB_VERSION=e2e50477342e32dd9a78143264dc4d15adb9fddb export PTHREAD_EMBEDDED_VERSION=4f43d30a23e8ac6d0334aef64272b4052b5bb7c2 export PSP_PACMAN_VERSION=a62b15e26919be932c1050c1c3f957193e7fdbe2 diff --git a/toolchains/riscos/packages/toolchain/build.sh b/toolchains/riscos/packages/toolchain/build.sh index e55f784..a227e67 100755 --- a/toolchains/riscos/packages/toolchain/build.sh +++ b/toolchains/riscos/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -GCCSDK_VERSION=7786 +GCCSDK_VERSION=7797 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/vita/Dockerfile.m4 b/toolchains/vita/Dockerfile.m4 index 3efd1b9..ea4686d 100644 --- a/toolchains/vita/Dockerfile.m4 +++ b/toolchains/vita/Dockerfile.m4 @@ -64,7 +64,7 @@ vdpm_package(curl) vdpm_package(freetype) -vdpm_package(libfribidi) +vdpm_package(fribidi) vdpm_package(FluidLite) diff --git a/toolchains/vita/functions-platform.sh b/toolchains/vita/functions-platform.sh index c5e226c..245b4da 100644 --- a/toolchains/vita/functions-platform.sh +++ b/toolchains/vita/functions-platform.sh @@ -5,7 +5,7 @@ do_vdpm_fetch () { mkdir "$1" cd "$1" - wget --progress=dot "http://dl.vitasdk.org/$1.tar.xz" -O - | tar --no-same-owner --no-same-permissions -xJ + wget --progress=dot "https://github.com/vitasdk/packages/releases/download/master/$1.tar.xz" -O - | tar --no-same-owner --no-same-permissions -xJ do_patch } diff --git a/toolchains/vita/packages/toolchain/build.sh b/toolchains/vita/packages/toolchain/build.sh index 59a208a..6f7a454 100755 --- a/toolchains/vita/packages/toolchain/build.sh +++ b/toolchains/vita/packages/toolchain/build.sh @@ -1,8 +1,8 @@ #! /bin/sh -VITA_VERSION=2.526 +VITA_VERSION=2.527 # This one must be updated as well -PKG_DATE=2024-05-23_20-53-38 +PKG_DATE=2024-08-09_11-28-39 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/workers/fetcher/Dockerfile.m4 b/workers/fetcher/Dockerfile.m4 index f48a5c4..9a9a33f 100644 --- a/workers/fetcher/Dockerfile.m4 +++ b/workers/fetcher/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`ALPINE_VERSION',3.20.1)m4_dnl +m4_define(`ALPINE_VERSION',3.20.2)m4_dnl FROM alpine:ALPINE_VERSION m4_define(`BASE_ALPINE',`')m4_dnl USER root diff --git a/workers/m4/debian-builder-base.m4 b/workers/m4/debian-builder-base.m4 index f1006e6..fa8c49a 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',20240612)') +m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240812)') 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 0fba300..76037ff 100644 --- a/workers/macosx-arm64/Dockerfile.m4 +++ b/workers/macosx-arm64/Dockerfile.m4 @@ -3,7 +3,7 @@ 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_TARGET_ARCH',aarch64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',23.6)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',23.5)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 75c7efe..4825ac5 100644 --- a/workers/macosx-x86_64/Dockerfile.m4 +++ b/workers/macosx-x86_64/Dockerfile.m4 @@ -3,7 +3,7 @@ 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_TARGET_ARCH',x86_64)m4_dnl -m4_define(`MACOSX_TARGET_VERSION',23.6)m4_dnl +m4_define(`MACOSX_TARGET_VERSION',23.5)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