From e0363a612d76be8ecb76ada6c7caf6d3182293b2 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 19 Apr 2021 16:19:19 +0200 Subject: [PATCH] Ports: Fix ports when building with ccache When building with ccache these ports failed to build because CC contains more than one word. The ncurses port also doesn't like how ccache preprocesses files. This patch fixes that. --- Ports/bzip2/package.sh | 10 +++++++++- Ports/figlet/package.sh | 5 ++++- Ports/ncurses/package.sh | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Ports/bzip2/package.sh b/Ports/bzip2/package.sh index 1790b62e66c..2766d137fbe 100755 --- a/Ports/bzip2/package.sh +++ b/Ports/bzip2/package.sh @@ -3,5 +3,13 @@ port=bzip2 version=1.0.8 files="https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz bzip2-${version}.tar.gz 67e051268d0c475ea773822f7500d0e5" auth_type=md5 -makeopts="bzip2 CC=${CC}" +makeopts=bzip2 installopts="PREFIX=${SERENITY_BUILD_DIR}/Root/usr/local" + +build() { + run make CC="${CC}" $makeopts bzip2 +} + +install() { + run make DESTDIR=$DESTDIR CC="${CC}" $installopts install +} diff --git a/Ports/figlet/package.sh b/Ports/figlet/package.sh index ed9ef90ad6c..0b877fb8b1e 100755 --- a/Ports/figlet/package.sh +++ b/Ports/figlet/package.sh @@ -3,4 +3,7 @@ port=figlet version=2.2.5 files="http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz figlet-${version}.tar.gz d88cb33a14f1469fff975d021ae2858e" auth_type=md5 -makeopts="CC=${CC} LD=${CC}" + +build() { + run make CC="${CC}" LD="${CC}" $makeopts +} diff --git a/Ports/ncurses/package.sh b/Ports/ncurses/package.sh index 2463ad6af51..ea6ead6e559 100755 --- a/Ports/ncurses/package.sh +++ b/Ports/ncurses/package.sh @@ -8,3 +8,7 @@ https://ftpmirror.gnu.org/gnu/ncurses/ncurses-${version}.tar.gz.sig ncurses-${ve https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" auth_type="sig" auth_opts="--keyring ./gnu-keyring.gpg ncurses-${version}.tar.gz.sig" + +pre_configure() { + export CPPFLAGS="-P" +}