Attachment 244932 Details for Bug 234971 – Patch to Mk to make ccache version configurable (via git am). Allows to select ccache4 as a compiler cache

[patch] Patch to Mk to make ccache version configurable (via git am). Allows to select ccache4 as a compiler cache

0001-Mk-Make-ccache-version-configurable.patch (text/plain), 1.72 KB, created by Oleg Sidorkin on 2023-09-16 13:16:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Sidorkin

Created: 2023-09-16 13:16:44 UTC

Size: 1.72 KB

patch

obsolete

>From ebb5191a9c538c694b13f5efd4ecd4b297fe478c Mon Sep 17 00:00:00 2001
>From: Oleg Sidorkin <osidorkin@gmail.com>
>Date: Tue, 14 Mar 2023 10:16:27 +0300
>Subject: [PATCH 1/6] Mk: Make ccache version configurable
>
>---
> Mk/bsd.ccache.mk           | 2 +-
> Mk/bsd.default-versions.mk | 4 +++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk
>index deb3997a68a0..6d94f90d7508 100644
>--- a/Mk/bsd.ccache.mk
>+++ b/Mk/bsd.ccache.mk
>@@ -83,7 +83,7 @@ CFLAGS+=	-fdebug-prefix-map=${WRKSRC}=.
> # Avoid depends loops between ccache and pkg
> .    if !defined(NO_CCACHE_DEPEND) && \
>     ${PKGORIGIN} != ${PKG_ORIGIN}
>-BUILD_DEPENDS+=		${CCACHE_BIN}:devel/ccache
>+BUILD_DEPENDS+=		${CCACHE_BIN}:devel/${CCACHE_DEFAULT}
> .    endif
> 
> .    if exists(${CCACHE_WRAPPER_PATH})
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index ab1ba1f8014f..777babe427a5 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -17,7 +17,7 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
> 
> LOCALBASE?=	/usr/local
> 
>-.  for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \
>+.  for lang in APACHE BDB CCACHE COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \
> 	GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \
> 	LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \
> 	PYCRYPTOGRAPHY PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
>@@ -36,6 +36,8 @@ ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
> APACHE_DEFAULT?=	2.4
> # Possible values: 5, 18
> BDB_DEFAULT?=		5
>+# Possible values: ccache ccache-memcached ccache-memcached-static ccache-static ccache4
>+CCACHE_DEFAULT?=	ccache 
> # Possible values: 2, 3
> COROSYNC_DEFAULT?=	2
> # Possible values: rust, legacy
>-- 
>2.42.0
>

Flags:

osidorkin: maintainer-approval?

Actions: View | Diff

Attachments on bug 234971: 211253 | 215193 | 220025 | 234077 | 240819 | 240831 | 244932