ALL: Various toolchain upgrades

- PSP doesn't not fail anymore when sh is dash - MXE updated curl which now requires to explicitely disable libpsl
scummvm · Sep 20, 2024 · dd0b66b · dd0b66b
1 parent cc2530f
commit dd0b66b
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 16 deletions.
diff --git 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=942b4fcf3c5dc0770d89b64fb33903123a1c92aa
+CCTOOLS_PORT_VERSION=b65b36cca9c2ec07c8895d805c6115611563cce0
 export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)

diff --git a/toolchains/devkitarm/Dockerfile.m4 b/toolchains/devkitarm/Dockerfile.m4
@@ -1,4 +1,4 @@
-m4_define(`DEVKITARM_VERSION',20240511)
+m4_define(`DEVKITARM_VERSION',20240918)
 # This version of devkitARM depends on a Debian Bullseye
 # For now it works with our version, we will have to ensure it stays like that
 FROM devkitpro/devkitarm:DEVKITARM_VERSION AS original-toolchain

diff --git a/toolchains/devkitswitch/Dockerfile.m4 b/toolchains/devkitswitch/Dockerfile.m4
@@ -1,4 +1,4 @@
-m4_define(`DEVKITA64_VERSION',20240827)
+m4_define(`DEVKITA64_VERSION',20240916)
 # 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
@@ -1,5 +1,5 @@
 m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
-m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240812)')
+m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240904)')
 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/mxe/Dockerfile.m4 b/toolchains/mxe/Dockerfile.m4
@@ -1,4 +1,4 @@
-m4_define(`MXE_VERSION',9f349e0de62a4a68bfc0f13d835a6c685dae9daa)m4_dnl
+m4_define(`MXE_VERSION',c5ebc8ad5678adf5c4cb504e4f1496264d4f46f8)m4_dnl
 
 m4_include(`paths.m4')m4_dnl
 m4_include(`packages.m4')m4_dnl

diff --git a/toolchains/mxe/packages/curl-light/curl-light.mk b/toolchains/mxe/packages/curl-light/curl-light.mk
@@ -23,6 +23,7 @@ define $(PKG)_BUILD
         $(MXE_CONFIGURE_OPTS) \
         --with-schannel \
         --without-winidn \
+        --without-libpsl \
         --enable-sspi \
         --enable-ipv6 \
         --enable-threaded-resolver \

diff --git a/toolchains/psp/Dockerfile.m4 b/toolchains/psp/Dockerfile.m4
@@ -40,9 +40,6 @@ RUN apt-get update && \
 		zip \
 		unzip \
 		wget && \
-	dpkg-divert --package dash --no-rename --remove /bin/sh && \
-	dpkg-divert --no-rename --divert /bin/sh.dash --add /bin/sh && \
-	ln -sf /bin/bash /bin/sh && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV PSPDEV=/usr/local/pspdev HOST=psp

diff --git 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=058dfb2ba8ea58a272482a2bc79af1d6622cd41c
+PSP_PACKAGES_VERSION=69fbfebb82f68dda59a821fc5456fb51f786c852
 
 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
@@ -1,12 +1,12 @@
 #! /bin/sh
 
-PSPDEV_VERSION=d1be8a70177d4c659fb6513e8ed2363acb1df360
+PSPDEV_VERSION=f6977f7b749fec33aa44cac0cf07aed5b31d5d7b
 export PSPTOOLCHAIN_VERSION=a420edb56fd5e63f21a043748b14ea2c7925bb48
-export PSPSDK_VERSION=d1d5dcf05d37fc6f7a147d1f8abb0d2c467f1a4d
-export PSPLINKUSB_VERSION=00cd43b0ee41b5a037346616453abc7dffbb48d5
+export PSPSDK_VERSION=1a33b06ba3fc6478da987672011f5cb7e4a8347a
+export PSPLINKUSB_VERSION=7d44fc10222df2d6f56d939ed4a15dc859651f4a
 export EBOOTSIGNER_VERSION=17d6386f034ac922f540ca78200961761b23ecae
-export PSPTOOLCHAIN_ALLEGREX_VERSION=6e225c051bbad644707dc428abe4a1957a8be469
-export PSPTOOLCHAIN_EXTRA_VERSION=a9532d80f733088c781f711eceef6471a585193d
+export PSPTOOLCHAIN_ALLEGREX_VERSION=e3e1bed110ff0b13f490873d0f83ecbff9cf27c7
+export PSPTOOLCHAIN_EXTRA_VERSION=3c9aa25abb47bb861523c17977f080b3682cad62
 export BINUTILS_VERSION=982f4d2cb190f0bce06a98e7556b1b20a256d826
 export GCC_VERSION=e8ee3aae2b5896b618464d155ed89d869ed5b110
 export NEWLIB_VERSION=e2e50477342e32dd9a78143264dc4d15adb9fddb

diff --git a/workers/fetcher/Dockerfile.m4 b/workers/fetcher/Dockerfile.m4
@@ -1,4 +1,4 @@
-m4_define(`ALPINE_VERSION',3.20.2)m4_dnl
+m4_define(`ALPINE_VERSION',3.20.3)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
@@ -1,5 +1,5 @@
 m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
-m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240812)')
+m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240904)')
 m4_define(`BASE_DEBIAN',`')m4_dnl
 FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim
 USER root