From 64c0c990538d7ca75d698ac276cdc4cf1bc01ce1 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 14 Dec 2025 16:32:48 +0000 Subject: [PATCH] COMMON: Make zlib honor LIBPATH zlib doesn't use autotools configure Make Atari use this variable instead of passing the configure argument --- toolchains/atari/Dockerfile.m4 | 4 ++-- toolchains/common/packages/zlib/build.sh | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/toolchains/atari/Dockerfile.m4 b/toolchains/atari/Dockerfile.m4 index fbe42de..390b02f 100644 --- a/toolchains/atari/Dockerfile.m4 +++ b/toolchains/atari/Dockerfile.m4 @@ -45,9 +45,9 @@ local_package(gemlib) local_package(ldg) local_package(usound) -helpers_package(zlib, --libdir=${PREFIX}/lib/m68020-60, CFLAGS="-O2 -fomit-frame-pointer -m68020-60") +helpers_package(zlib,, CFLAGS="-O2 -fomit-frame-pointer -m68020-60" LIBDIR=${PREFIX}/lib/m68020-60) -helpers_package(zlib, --libdir=${PREFIX}/lib/m5475, CFLAGS="-O2 -fomit-frame-pointer -mcpu=5475") +helpers_package(zlib,, CFLAGS="-O2 -fomit-frame-pointer -mcpu=5475" LIBDIR=${PREFIX}/lib/m5475) helpers_package(libpng1.6, --bindir=${PREFIX}/bin/m5475 --libdir=${PREFIX}/lib/m5475, CFLAGS="-O2 -fomit-frame-pointer -mcpu=5475") helpers_package(libjpeg-turbo, -DCMAKE_SYSTEM_NAME=Generic -DCMAKE_SYSTEM_PROCESSOR=m68k -DWITH_SIMD=OFF -DCMAKE_INSTALL_BINDIR=${PREFIX}/bin/m5475 -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib/m5475, CFLAGS="-O2 -fomit-frame-pointer -mcpu=5475") helpers_package(giflib,, CFLAGS="-fno-PIC -O2 -fomit-frame-pointer -mcpu=5475" LIBDIR=${PREFIX}/lib/m5475) diff --git a/toolchains/common/packages/zlib/build.sh b/toolchains/common/packages/zlib/build.sh index 3538fc1..19bf9f4 100755 --- a/toolchains/common/packages/zlib/build.sh +++ b/toolchains/common/packages/zlib/build.sh @@ -7,7 +7,12 @@ HELPERS_DIR=$PACKAGE_DIR/../.. do_make_bdir do_pkg_fetch zlib -./configure --prefix=$PREFIX --static "$@" + +# Don't use do_configure as it's not autotools compliant +if [ -n "$LIBDIR" ]; then + libdir="--libdir=$LIBDIR" +fi +./configure --prefix=$PREFIX --static $libdir # Only build the library and not its samples do_make libz.a