From 18c4ea789ea763e6ee7f03b331c47b62b9dbfd31 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Fri, 26 Sep 2025 19:42:59 +0200 Subject: [PATCH 1/4] external_deps: do not cross-compile pkgconfig Do not cross-compile pkgconfig, it is part of the cross-compilation toolchain. --- external_deps/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/external_deps/build.sh b/external_deps/build.sh index 7ecc965e2a..1ad48bb9f0 100755 --- a/external_deps/build.sh +++ b/external_deps/build.sh @@ -262,7 +262,12 @@ build_pkgconfig() { cd "${dir_name}" - CFLAGS="${CFLAGS} -Wno-error=int-conversion" \ + # 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 \ --with-internal-glib } From 588e09ac72612880287438ba172fd9650464427b Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Fri, 26 Sep 2025 19:26:55 +0200 Subject: [PATCH 2/4] external_deps: we don't build SDL with pkg-config anymore --- external_deps/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_deps/build.sh b/external_deps/build.sh index 1ad48bb9f0..4b74928a55 100755 --- a/external_deps/build.sh +++ b/external_deps/build.sh @@ -249,7 +249,7 @@ cmake_build() { cmake --install build --strip } -# Build pkg-config, needed for opusfile and SDL3. +# 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}" From caa71cf8ef02a3cfce8e30283c19b0e3942349c9 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Fri, 26 Sep 2025 19:02:14 +0200 Subject: [PATCH 3/4] external_deps: rework the macos-amd64 setup a bit --- external_deps/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external_deps/build.sh b/external_deps/build.sh index 4b74928a55..41941b653e 100755 --- a/external_deps/build.sh +++ b/external_deps/build.sh @@ -1421,7 +1421,7 @@ setup_macos-amd64-default() { MACOS_ARCH=x86_64 # OpenAL requires 10.14. export MACOSX_DEPLOYMENT_TARGET=10.14 # works with CMake - common_setup macos x86_64-apple-darwin11 + common_setup macos "x86_64-apple-macos${MACOSX_DEPLOYMENT_TARGET}" } # Set up environment for 32-bit i686 Linux From faa49c0377df44cab1bcb2422e3911e82032c10e Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Fri, 26 Sep 2025 22:51:57 +0200 Subject: [PATCH 4/4] external_deps: do not build OpenAL utils --- external_deps/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/external_deps/build.sh b/external_deps/build.sh index 41941b653e..e5e77cf91a 100755 --- a/external_deps/build.sh +++ b/external_deps/build.sh @@ -770,6 +770,7 @@ build_openal() { cd "${dir_name}" cmake_build \ + -DALSOFT_UTILS=OFF \ "${openal_cmake_args[@]}" ;; esac