From 34ae69b99d334d37a82dd94449bfa9548fc2db16 Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Thu, 14 Jul 2022 08:31:09 +0200 Subject: [PATCH] Ports/bzip2: Set AR and RANLIB bzip2's Makefile uses the '=' operator to set these variables so they cannot be overridden by just the environment variables; we have to pass them on the command line. This change ensures that the system ar/ranlib are no longer used, so the port can be build on macOS or non-x86 Linux. --- Ports/bzip2/package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ports/bzip2/package.sh b/Ports/bzip2/package.sh index 7a93db319bd..dd81322f6e7 100755 --- a/Ports/bzip2/package.sh +++ b/Ports/bzip2/package.sh @@ -7,9 +7,9 @@ makeopts=("bzip2") installopts=("PREFIX=${SERENITY_INSTALL_ROOT}/usr/local") build() { - run make CC="${CC}" "${makeopts[@]}" bzip2 + run make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" "${makeopts[@]}" bzip2 } install() { - run make DESTDIR=${SERENITY_INSTALL_ROOT} CC="${CC}" "${installopts[@]}" install + run make DESTDIR=${SERENITY_INSTALL_ROOT} CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" "${installopts[@]}" install }