From 271a2c027e457542eae3a6804004ede38ed86331 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 27 Oct 2023 13:08:47 +0200 Subject: [PATCH 1/3] ccache: update to 4.8.3. --- srcpkgs/ccache/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index dd8d1e704ab6e..0d9a2658b11ca 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -1,6 +1,6 @@ # Template file for 'ccache' pkgname=ccache -version=4.8.2 +version=4.8.3 revision=1 build_style=cmake configure_args="-DENABLE_TESTING=OFF -DREDIS_STORAGE_BACKEND=OFF @@ -13,8 +13,8 @@ homepage="https://ccache.dev" changelog="https://ccache.dev/releasenotes.html" distfiles="https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}.tar.xz https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}-linux-x86_64.tar.xz" -checksum="3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49 - 0b33f39766fe9db67f40418aed6a5b3d7b2f4f7fab025a8213264b77a2d0e1b1" +checksum="e47374c810b248cfca3665ee1d86c7c763ffd68d9944bc422d9c1872611f2b11 + 1021f6dc9641447524cc7bceb72f807f2d6502df118d69dc3f0f86cacf048e79" if [ -n "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DENABLE_TESTING=ON" From 732b3441556fa79468ab3ba2bec88014c94172c1 Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 27 Oct 2023 13:09:29 +0200 Subject: [PATCH 2/3] SQUASH: ccache: sort cross gcc triplets --- srcpkgs/ccache/template | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index 0d9a2658b11ca..018ba09f22cc0 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -33,14 +33,29 @@ post_install() { # gcc for f in gcc cc c++ g++; do ln -sfr ${DESTDIR}/usr/bin/ccache ${DESTDIR}/usr/lib/ccache/bin/${f} - for x in arm-linux-gnueabi arm-linux-gnueabihf armv7l-linux-gnueabihf \ - arm-linux-musleabihf armv7l-linux-musleabihf aarch64-linux-gnu \ - i686-pc-linux-gnu aarch64-linux-musl i686-linux-musl \ - mips-linux-musl mips-linux-muslhf mipsel-linux-musl mipsel-linux-muslhf \ - powerpc-linux-gnu powerpc-linux-musl \ - powerpcle-linux-gnu powerpcle-linux-musl \ - powerpc64-linux-gnu powerpc64-linux-musl \ - powerpc64le-linux-musl powerpc64le-linux-gnu; do + for x in \ + aarch64-linux-gnu \ + aarch64-linux-musl \ + arm-linux-gnueabi \ + arm-linux-gnueabihf \ + arm-linux-musleabihf \ + armv7l-linux-gnueabihf \ + armv7l-linux-musleabihf \ + i686-linux-musl \ + i686-pc-linux-gnu \ + mips-linux-musl \ + mips-linux-muslhf \ + mipsel-linux-musl \ + mipsel-linux-muslhf \ + powerpc-linux-gnu \ + powerpc-linux-musl \ + powerpc64-linux-gnu \ + powerpc64-linux-musl \ + powerpc64le-linux-gnu \ + powerpc64le-linux-musl \ + powerpcle-linux-gnu \ + powerpcle-linux-musl \ + ; do ln -sfr ${DESTDIR}/usr/bin/ccache ${DESTDIR}/usr/lib/ccache/bin/${x}-${f} done done From fcbfa949bad5c72b7eb84b1eabfd6f90124d7a0f Mon Sep 17 00:00:00 2001 From: Piraty Date: Fri, 27 Oct 2023 13:22:38 +0200 Subject: [PATCH 3/3] SQUASH: ccache: add more cross compiler symlinks --- srcpkgs/ccache/template | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index 018ba09f22cc0..b18c60e3ae667 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -33,20 +33,27 @@ post_install() { # gcc for f in gcc cc c++ g++; do ln -sfr ${DESTDIR}/usr/bin/ccache ${DESTDIR}/usr/lib/ccache/bin/${f} + # cross compilers for x in \ aarch64-linux-gnu \ aarch64-linux-musl \ arm-linux-gnueabi \ arm-linux-gnueabihf \ + arm-linux-musleabi \ arm-linux-musleabihf \ + arm-none-eabi \ armv7l-linux-gnueabihf \ armv7l-linux-musleabihf \ + avr \ i686-linux-musl \ i686-pc-linux-gnu \ + i686-w64-mingw32 \ mips-linux-musl \ mips-linux-muslhf \ mipsel-linux-musl \ mipsel-linux-muslhf \ + musl-gcc \ + or1k-none-elf \ powerpc-linux-gnu \ powerpc-linux-musl \ powerpc64-linux-gnu \ @@ -55,6 +62,11 @@ post_install() { powerpc64le-linux-musl \ powerpcle-linux-gnu \ powerpcle-linux-musl \ + riscv64-linux-gnu \ + riscv64-linux-musl \ + x86_64-linux-gnu \ + x86_64-linux-musl \ + x86_64-w64-mingw32 \ ; do ln -sfr ${DESTDIR}/usr/bin/ccache ${DESTDIR}/usr/lib/ccache/bin/${x}-${f} done