From 978a8de84b9c38ff5334f7b3d8dc61526ce8b9a5 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Sat, 27 Jun 2026 05:11:29 +0200
Subject: [PATCH 1/9] external_deps: deduplicate files with hardlinks before
 making the tarball

---
 external_deps/build.sh | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 2b0600cdad..c94306d080 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -97,6 +97,21 @@ smart_copy() {
 	fi
 }
 
+dedupe_dir ()
+{
+	if command -v jdupes >/dev/null 2>&1
+	then
+		log STATUS 'Using jdupes for deduplication'
+		jdupes -r -L "${@}"
+	elif command -v rdfind >/dev/null 2>&1
+	then
+		log STATUS 'Using rdfind for deduplication'
+		rdfind -makeresultsfile false -makehardlinks true "${@}"
+	else
+		log WARNING 'WARN: missing jdupes or rdfind, will not deduplicate'
+	fi
+}
+
 # Extract an archive into the given subdirectory of the build dir and cd to it
 # Usage: extract <filename> <directory>
 extract() {
@@ -1280,16 +1295,26 @@ build_install() {
 # Create a redistributable package for the dependencies
 build_package() {
 	cd "${WORK_DIR}"
+
 	rm -f "${PKG_TARBALL}"
-	local XZ_OPT='-9e'
+
 	case "${PLATFORM}" in
 	windows-*-*)
-		tar --dereference -cvJf "${PKG_TARBALL}" "${PKG_BASEDIR}"
-		;;
-	*)
-		tar -cvJf "${PKG_TARBALL}" "${PKG_BASEDIR}"
+		# Dereference symbolic links.
+		rm -rf "${PKG_BASEDIR}.flatten"
+		mv "${PKG_BASEDIR}" "${PKG_BASEDIR}.flatten"
+		smart_copy -RL "${PKG_BASEDIR}.flatten" "${PKG_BASEDIR}"
+		rm -rf "${PKG_BASEDIR}.flatten"
 		;;
 	esac
+
+	dedupe_dir "${PKG_BASEDIR}" >/dev/null
+
+	log STATUS "Packaging ${PKG_BASEDIR}"
+
+	local XZ_OPT='-9e'
+
+	tar -cvJf "${PKG_TARBALL}" "${PKG_BASEDIR}"
 }
 
 build_wipe() {

From fb7fac62af813f38d3e42d21d1dafb335da19373 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 01:16:29 +0200
Subject: [PATCH 2/9] external_deps: make possible to reconfigure for a
 different target

---
 external_deps/build.sh | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index c94306d080..17f413c90f 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -1354,23 +1354,34 @@ common_setup() {
 	common_setup_arch
 
 	EXE_EXT="${EXE_EXT:-}"
-	DOWNLOAD_DIR="${WORK_DIR}/download_cache"
-	PKG_BASEDIR="${PLATFORM}_${DEPS_VERSION}"
-	PKG_TARBALL="${PKG_BASEDIR}.tar.xz"
-	BUILD_BASEDIR="build-${PKG_BASEDIR}"
-	BUILD_DIR="${WORK_DIR}/${BUILD_BASEDIR}"
-	PREFIX="${BUILD_DIR}/prefix"
-	PATH="${PREFIX}/bin:${PATH}"
+
+	if "${GLOBAL_SETUP_ONCE:-true}"
+	then
+		DOWNLOAD_DIR="${WORK_DIR}/download_cache"
+		PKG_BASEDIR="${PLATFORM}_${DEPS_VERSION}"
+		PKG_TARBALL="${PKG_BASEDIR}.tar.xz"
+		BUILD_BASEDIR="build-${PKG_BASEDIR}"
+		BUILD_DIR="${WORK_DIR}/${BUILD_BASEDIR}"
+		PREFIX="${BUILD_DIR}/prefix"
+		PATH="${PREFIX}/bin:${PATH}"
+
+		mkdir -p "${DOWNLOAD_DIR}"
+		mkdir -p "${PREFIX}/bin"
+		mkdir -p "${PREFIX}/include"
+		mkdir -p "${PREFIX}/lib"
+
+		export PATH
+
+		GLOBAL_SETUP_ONCE='false'
+	fi
+
 	PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${CROSS_PKG_CONFIG_PATH}"
 	CPPFLAGS+=" -I${PREFIX}/include"
 	LDFLAGS+=" -L${PREFIX}/lib"
 
-	mkdir -p "${DOWNLOAD_DIR}"
-	mkdir -p "${PREFIX}/bin"
-	mkdir -p "${PREFIX}/include"
-	mkdir -p "${PREFIX}/lib"
-
-	export CC CXX LD AR RANLIB STRIP PKG_CONFIG PKG_CONFIG_PATH PATH CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	export PKG_CONFIG PKG_CONFIG_PATH
+	export CC CXX LD AR RANLIB STRIP
+	export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 }
 
 common_setup_arch() {

From 9028cc7d226731c6d89e75aa63806d550a96d1e8 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 01:59:46 +0200
Subject: [PATCH 3/9] external_deps: make defaults resetable with
 setup_default()

---
 external_deps/build.sh | 64 +++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 17f413c90f..13f43b374a 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -64,26 +64,6 @@ NCURSES_VERSION=6.5
 WASISDK_VERSION=16.0
 WASMTIME_VERSION=2.0.2
 
-# Require the compiler names to be explicitly hardcoded, we should not inherit them
-# from environment as we heavily cross-compile.
-CC='false'
-CXX='false'
-# Set defaults.
-LD='ld'
-AR='ar'
-RANLIB='ranlib'
-PKG_CONFIG='pkg-config'
-CROSS_PKG_CONFIG_PATH=''
-LIBS_SHARED='OFF'
-LIBS_STATIC='ON'
-CMAKE_TOOLCHAIN=''
-# Always reset flags, we heavily cross-compile and must not inherit any stray flag
-# from environment.
-CPPFLAGS=''
-CFLAGS='-O3 -fPIC'
-CXXFLAGS='-O3 -fPIC'
-LDFLAGS='-O3 -fPIC'
-
 log() {
 	level="${1}"; shift
 	printf '%s: %s\n' "${level}" "${@}" >&2
@@ -1353,8 +1333,6 @@ common_setup() {
 	"common_setup_${1}"
 	common_setup_arch
 
-	EXE_EXT="${EXE_EXT:-}"
-
 	if "${GLOBAL_SETUP_ONCE:-true}"
 	then
 		DOWNLOAD_DIR="${WORK_DIR}/download_cache"
@@ -1460,8 +1438,42 @@ common_setup_linux() {
 	CXXFLAGS+=' -fPIC'
 }
 
+setup_default() {
+	# Require the compiler names to be explicitly hardcoded, we should not inherit them
+	# from environment as we heavily cross-compile.
+	export CC='false'
+	export CXX='false'
+
+	# Set defaults.
+	export LD='ld'
+	export AR='ar'
+	export RANLIB='ranlib'
+	export STRIP='strip'
+	export PKG_CONFIG='pkg-config'
+	export CROSS_PKG_CONFIG_PATH=''
+
+	LIBS_SHARED='OFF'
+	LIBS_STATIC='ON'
+	CMAKE_TOOLCHAIN=''
+	EXE_EXT=''
+
+	# Always reset flags, we heavily cross-compile and must not inherit any stray flag
+	# from environment.
+	export CPPFLAGS=''
+	export CFLAGS='-O3 -fPIC'
+	export CXXFLAGS='-O3 -fPIC'
+	export LDFLAGS='-O3 -fPIC'
+
+	unset BITNESS
+	unset MACOS_ARCH
+	unset CMAKE_OSX_ARCHITECTURES
+	unset CROSS_PKG_CONFIG_PATH
+	unset MACOSX_DEPLOYMENT_TARGET
+}
+
 # Set up environment for 32-bit i686 Windows for Visual Studio (compile all as .dll)
 setup_windows-i686-msvc() {
+	setup_default
 	BITNESS=32
 	CFLAGS+=' -mpreferred-stack-boundary=2'
 	CXXFLAGS+=' -mpreferred-stack-boundary=2'
@@ -1470,24 +1482,28 @@ setup_windows-i686-msvc() {
 
 # Set up environment for 64-bit amd64 Windows for Visual Studio (compile all as .dll)
 setup_windows-amd64-msvc() {
+	setup_default
 	BITNESS=64
 	common_setup msvc x86_64-w64-mingw32
 }
 
 # Set up environment for 32-bit i686 Windows for MinGW (compile all as .a)
 setup_windows-i686-mingw() {
+	setup_default
 	BITNESS=32
 	common_setup mingw i686-w64-mingw32
 }
 
 # Set up environment for 64-bit amd64 Windows for MinGW (compile all as .a)
 setup_windows-amd64-mingw() {
+	setup_default
 	BITNESS=64
 	common_setup mingw x86_64-w64-mingw32
 }
 
 # Set up environment for 64-bit amd64 macOS
 setup_macos-amd64-default() {
+	setup_default
 	MACOS_ARCH=x86_64
 	# OpenAL requires 10.14.
 	export MACOSX_DEPLOYMENT_TARGET=10.14 # works with CMake
@@ -1496,21 +1512,25 @@ setup_macos-amd64-default() {
 
 # Set up environment for 32-bit i686 Linux
 setup_linux-i686-default() {
+	setup_default
 	common_setup linux i686-unknown-linux-gnu
 }
 
 # Set up environment for 64-bit amd64 Linux
 setup_linux-amd64-default() {
+	setup_default
 	common_setup linux x86_64-unknown-linux-gnu
 }
 
 # Set up environment for 32-bit little-endian hard-float arm Linux
 setup_linux-armhf-default() {
+	setup_default
 	common_setup linux arm-unknown-linux-gnueabihf
 }
 
 # Set up environment for 64-bit little-endian arm Linux
 setup_linux-arm64-default() {
+	setup_default
 	common_setup linux aarch64-unknown-linux-gnu
 }
 

From 004fe80742faa1db6779f356c621977cd41eb844 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Sat, 27 Jun 2026 03:54:41 +0200
Subject: [PATCH 4/9] external_deps: make possible to loop the cmake build

---
 external_deps/build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 13f43b374a..c1288d6d84 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -239,6 +239,8 @@ cmake_build() {
 		cmake_args+=("${@}")
 	fi
 
+	rm -rf build
+
 	cmake -S . -B build \
 		-DCMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN}" \
 		-DCMAKE_BUILD_TYPE='Release' \

From 2880fe374127c94bd0b308ab6bdee69b63f70c70 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 01:48:05 +0200
Subject: [PATCH 5/9] external_deps: extract platform components

---
 external_deps/build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index c1288d6d84..f5341fc4f1 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -1335,6 +1335,11 @@ common_setup() {
 	"common_setup_${1}"
 	common_setup_arch
 
+	PLATFORM_SYSTEM="$(echo "${PLATFORM}" | cut -f1 -d-)"
+	PLATFORM_ARCH="$(echo "${PLATFORM}" | cut -f2 -d-)"
+	PLATFORM_COMPILER="$(echo "${PLATFORM}" | cut -f3 -d-)"
+	PLATFORM_TARGET="${PLATFORM_SYSTEM}-${PLATFORM_ARCH}"
+
 	if "${GLOBAL_SETUP_ONCE:-true}"
 	then
 		DOWNLOAD_DIR="${WORK_DIR}/download_cache"

From 8262179d1506b92996cc095513cc06547c03fddb Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Sat, 27 Jun 2026 08:49:33 +0200
Subject: [PATCH 6/9] external_deps: deduplicate nacl from pnacl copy code

---
 external_deps/build.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index f5341fc4f1..8317c749dd 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -1060,18 +1060,12 @@ build_naclsdk() {
 		# Fix permissions on a few files which deny access to non-owner
 		chmod 644 "${PREFIX}/irt_core-${DAEMON_ARCH}.nexe"
 		;;
-	linux-i686-*)
+	linux-i686-*|linux-armhf-*|linux-arm64-*)
 		smart_copy pepper_*"/tools/nacl_helper_bootstrap_${NACLSDK_ARCH}" "${PREFIX}/nacl_helper_bootstrap"
 		# Fix permissions on a few files which deny access to non-owner
 		chmod 644 "${PREFIX}/irt_core-${DAEMON_ARCH}.nexe"
 		chmod 755 "${PREFIX}/nacl_helper_bootstrap" "${PREFIX}/nacl_loader"
 		;;
-	linux-armhf-*|linux-arm64-*)
-		smart_copy pepper_*"/tools/nacl_helper_bootstrap_arm" "${PREFIX}/nacl_helper_bootstrap"
-		# Fix permissions on a few files which deny access to non-owner
-		chmod 644 "${PREFIX}/irt_core-${DAEMON_ARCH}.nexe"
-		chmod 755 "${PREFIX}/nacl_helper_bootstrap" "${PREFIX}/nacl_loader"
-		;;
 	esac
 	case "${PLATFORM}" in
 	linux-arm64-*)

From 4b26e9f9e4a2259186f8069cd1bd8ac9d363f590 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 08:31:21 +0200
Subject: [PATCH 7/9] external_deps: provide a reusable framework for building
 native tools needed for cross-compilation

---
 external_deps/build.sh | 71 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 61 insertions(+), 10 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 8317c749dd..459f50ad29 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -178,6 +178,18 @@ download_extract() {
 configure_build() {
 	local configure_args=()
 
+	case "${HOST}" in
+	native)
+		configure_args+=(--prefix="${NATIVE_PREFIX}")
+		configure_args+=(--libdir="${NATIVE_PREFIX}/lib")
+		;;
+	*)
+		configure_args+=(--host="${HOST}")
+		configure_args+=(--prefix="${PREFIX}")
+		configure_args+=(--libdir="${PREFIX}/lib")
+		;;
+	esac
+
 	if [ "${LIBS_SHARED}" = 'ON' ]
 	then
 		configure_args+=(--enable-shared)
@@ -199,9 +211,6 @@ configure_build() {
 	fi
 
 	./configure \
-		--host="${HOST}" \
-		--prefix="${PREFIX}" \
-		--libdir="${PREFIX}/lib" \
 		"${configure_args[@]}"
 
 	make
@@ -225,6 +234,17 @@ get_compiler_arg1() {
 cmake_build() {
 	local cmake_args=()
 
+	case "${HOST}" in
+	native)
+		cmake_args+=(-DCMAKE_PREFIX_PATH="${NATIVE_PREFIX}")
+		cmake_args+=(-DCMAKE_INSTALL_PREFIX="${NATIVE_PREFIX}")
+		;;
+	*)
+		cmake_args+=(-DCMAKE_PREFIX_PATH="${PREFIX}")
+		cmake_args+=(-DCMAKE_INSTALL_PREFIX="${PREFIX}")
+		;;
+	esac
+
 	cmake_args+=(-DCMAKE_C_COMPILER="$(get_compiler_name ${CC})")
 	cmake_args+=(-DCMAKE_CXX_COMPILER="$(get_compiler_name ${CXX})")
 	cmake_args+=(-DCMAKE_C_COMPILER_ARG1="$(get_compiler_arg1 ${CC})")
@@ -244,8 +264,6 @@ cmake_build() {
 	cmake -S . -B build \
 		-DCMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN}" \
 		-DCMAKE_BUILD_TYPE='Release' \
-		-DCMAKE_PREFIX_PATH="${PREFIX}" \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DBUILD_SHARED_LIBS="${LIBS_SHARED}" \
 		"${cmake_args[@]}"
 
@@ -253,7 +271,6 @@ cmake_build() {
 	cmake --install build --strip
 }
 
-# Build pkg-config, needed for opusfile.
 # As a host-mode dependency it must be provided by the system when cross-compiling.
 build_pkgconfig() {
 	local dir_name="pkg-config-${PKGCONFIG_VERSION}"
@@ -1342,14 +1359,17 @@ common_setup() {
 		BUILD_BASEDIR="build-${PKG_BASEDIR}"
 		BUILD_DIR="${WORK_DIR}/${BUILD_BASEDIR}"
 		PREFIX="${BUILD_DIR}/prefix"
-		PATH="${PREFIX}/bin:${PATH}"
+		NATIVE_PREFIX="${BUILD_DIR}/native-prefix"
 
 		mkdir -p "${DOWNLOAD_DIR}"
 		mkdir -p "${PREFIX}/bin"
 		mkdir -p "${PREFIX}/include"
 		mkdir -p "${PREFIX}/lib"
+		mkdir -p "${NATIVE_PREFIX}/bin"
+		mkdir -p "${NATIVE_PREFIX}/include"
+		mkdir -p "${NATIVE_PREFIX}/lib"
 
-		export PATH
+		PATH="${NATIVE_PREFIX}/bin:${PATH}"
 
 		GLOBAL_SETUP_ONCE='false'
 	fi
@@ -1358,6 +1378,7 @@ common_setup() {
 	CPPFLAGS+=" -I${PREFIX}/include"
 	LDFLAGS+=" -L${PREFIX}/lib"
 
+	export PATH
 	export PKG_CONFIG PKG_CONFIG_PATH
 	export CC CXX LD AR RANLIB STRIP
 	export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
@@ -1381,6 +1402,8 @@ common_setup_arch() {
 		CFLAGS+=' -march=armv7-a -mfpu=neon'
 		CXXFLAGS+=' -march=armv7-a -mfpu=neon'
 		;;
+	*-native-*)
+		;;
 	*)
 		log ERROR 'Unsupported platform'
 		;;
@@ -1439,6 +1462,14 @@ common_setup_linux() {
 	CXXFLAGS+=' -fPIC'
 }
 
+common_setup_native() {
+	case "$(uname -s)" in
+	CYGWIN_NT-*|MSYS_NT-*|MINGW*_NT-*)
+		EXE_EXT='.exe'
+		;;
+	esac
+}
+
 setup_default() {
 	# Require the compiler names to be explicitly hardcoded, we should not inherit them
 	# from environment as we heavily cross-compile.
@@ -1468,7 +1499,6 @@ setup_default() {
 	unset BITNESS
 	unset MACOS_ARCH
 	unset CMAKE_OSX_ARCHITECTURES
-	unset CROSS_PKG_CONFIG_PATH
 	unset MACOSX_DEPLOYMENT_TARGET
 }
 
@@ -1535,6 +1565,27 @@ setup_linux-arm64-default() {
 	common_setup linux aarch64-unknown-linux-gnu
 }
 
+# Set up environment for native host tools
+setup_native() {
+	setup_default
+	CC='cc'
+	CXX='c++'
+	common_setup native native
+}
+
+setup_platform() {
+	case "${1}" in
+	native)
+		export PLATFORM='native-native-native'
+		setup_native
+		;;
+	*)
+		export PLATFORM="${1}"
+		"setup_${PLATFORM}"
+		;;
+	esac
+}
+
 base_windows_amd64_msvc_packages='zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk depcheck genlib'
 all_windows_amd64_msvc_packages="${base_windows_amd64_msvc_packages}"
 
@@ -1722,6 +1773,6 @@ esac
 
 for PLATFORM in ${platform_list}
 do (
-	"setup_${PLATFORM}"
+	setup_platform "${PLATFORM}"
 	build "${@}"
 ) done

From c37e88687ea9f7c6fac1046b1a8604809bb7f996 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 08:49:11 +0200
Subject: [PATCH 8/9] external_deps: build pkg-config as a native tool

---
 external_deps/build.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 459f50ad29..525efb64c5 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -271,26 +271,26 @@ cmake_build() {
 	cmake --install build --strip
 }
 
-# As a host-mode dependency it must be provided by the system when cross-compiling.
-build_pkgconfig() {
+# Build pkg-config, needed for opusfile on macos.
+# It is part of the cross-compilation toolchain.
+# As a host-mode native dependency it must be provided by the system when cross-compiling.
+build_native-pkgconfig() {
 	local dir_name="pkg-config-${PKGCONFIG_VERSION}"
 	local archive_name="${dir_name}.tar.gz"
 
-	download_extract pkgconfig "${archive_name}" \
+	download_extract native-pkgconfig "${archive_name}" \
 		"${PKGCONFIG_BASEURL}/${archive_name}"
 
 	"${download_only}" && return
 
 	cd "${dir_name}"
 
-	# Reset the environment variables, we don't cross-compile this,
-	# it is part of the cross-compilation toolchain.
-	# CXXFLAGS is unused.
-	CFLAGS='-Wno-error=int-conversion' \
-	LDFLAGS='' \
-	HOST='' \
-	configure_build \
+	(
+		setup_platform 'native'
+		CFLAGS='-Wno-error=int-conversion' \
+		configure_build \
 		--with-internal-glib
+	)
 }
 
 # Build NASM
@@ -1598,7 +1598,7 @@ all_windows_amd64_mingw_packages="${base_windows_amd64_mingw_packages}"
 base_windows_i686_mingw_packages="${base_windows_amd64_mingw_packages}"
 all_windows_i686_mingw_packages="${base_windows_amd64_mingw_packages}"
 
-base_macos_amd64_default_packages='pkgconfig nasm gmp nettle sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk'
+base_macos_amd64_default_packages='native-pkgconfig nasm gmp nettle sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk'
 all_macos_amd64_default_packages="${base_macos_amd64_default_packages}"
 
 base_linux_i686_default_packages='sdl3 naclsdk'
@@ -1639,7 +1639,7 @@ printHelp() {
 	    all     linux windows macos
 
 	Packages:
-	    pkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
+	    native-pkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
 
 	Virtual packages:
 	    base    build packages for pre-built binaries to be downloaded when building the game

From 54dae41b30d3169a80b5edd2bd410f1523d93a80 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Fri, 26 Jun 2026 09:05:48 +0200
Subject: [PATCH 9/9] external_deps: build nasm as a native tool

---
 external_deps/build.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/external_deps/build.sh b/external_deps/build.sh
index 525efb64c5..5f69084660 100755
--- a/external_deps/build.sh
+++ b/external_deps/build.sh
@@ -293,19 +293,21 @@ build_native-pkgconfig() {
 	)
 }
 
-# Build NASM
-build_nasm() {
+# Build NASM, needed for jpeg on macos-amd64.
+# It is part of the compilation toolchain.
+# As a host-mode native dependency it must be provided by the system when compiling.
+build_native-nasm() {
 	case "${PLATFORM}" in
 	macos-*-*)
 		local dir_name="nasm-${NASM_VERSION}"
 		local archive_name="${dir_name}-macosx.zip"
 
-		download_extract nasm "${archive_name}" \
+		download_extract native-nasm "${archive_name}" \
 			"${NASM_BASEURL}/${NASM_VERSION}/macosx/${archive_name}"
 
 		"${download_only}" && return
 
-		smart_copy "${dir_name}/nasm" "${PREFIX}/bin"
+		smart_copy "${dir_name}/nasm" "${NATIVE_PREFIX}/bin"
 		;;
 	*)
 		log ERROR 'Unsupported platform for NASM'
@@ -1598,7 +1600,7 @@ all_windows_amd64_mingw_packages="${base_windows_amd64_mingw_packages}"
 base_windows_i686_mingw_packages="${base_windows_amd64_mingw_packages}"
 all_windows_i686_mingw_packages="${base_windows_amd64_mingw_packages}"
 
-base_macos_amd64_default_packages='native-pkgconfig nasm gmp nettle sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk'
+base_macos_amd64_default_packages='native-pkgconfig native-nasm gmp nettle sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk'
 all_macos_amd64_default_packages="${base_macos_amd64_default_packages}"
 
 base_linux_i686_default_packages='sdl3 naclsdk'
@@ -1639,7 +1641,7 @@ printHelp() {
 	    all     linux windows macos
 
 	Packages:
-	    native-pkgconfig nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
+	    native-pkgconfig native-nasm zlib gmp nettle curl sdl3 glew png jpeg webp openal ogg vorbis opus opusfile naclsdk wasisdk wasmtime
 
 	Virtual packages:
 	    base    build packages for pre-built binaries to be downloaded when building the game