ScummVM/dockerized-bb
1
0
Fork 0
mirror of https://github.com/scummvm/dockerized-bb.git synced 2026-05-21 05:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

COMMON: Make zlib honor LIBPATH

Browse Source 
zlib doesn't use autotools configure
Make Atari use this variable instead of passing the configure argument
This commit is contained in:
Le Philousophe
2025-12-14 16:32:48 +00:00
parent 3d34ac99be
commit 64c0c99053
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchains/atari/Dockerfile.m4
+2 -2
View File
@@ -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)
toolchains/common/packages/zlib/build.sh
+6 -1
View File
@@ -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