Attachment 226428 Details for Bug 252070 – patch

[patch] patch

3d23d99dd3.patch (text/plain), 1.34 KB, created by Ivan Rozhuk on 2021-07-13 13:14:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2021-07-13 13:14:38 UTC

Size: 1.34 KB

patch

obsolete

>From 3d23d99dd34c43f1917a352687584318dd6d0c0f Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Wed, 23 Dec 2020 20:12:32 +0300
>Subject: [PATCH] Mk: add new default-version variant for ccache
>
>https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252070
>---
> Mk/bsd.ccache.mk           | 2 +-
> Mk/bsd.default-versions.mk | 2 ++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/Mk/bsd.ccache.mk b/Mk/bsd.ccache.mk
>index c004d26d866a..8237ea22ec5c 100644
>--- a/Mk/bsd.ccache.mk
>+++ b/Mk/bsd.ccache.mk
>@@ -49,7 +49,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 e0717ef3596d..3a3be973f9ff 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -35,6 +35,8 @@ ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
> APACHE_DEFAULT?=	2.4
> # Possible values: 5, 6, 18
> BDB_DEFAULT?=		5
>+# Possible values: ccahe, ccahe-devel, ccahe-memcached, ccahe-memcached-static, ccahe-static
>+CCACHE_DEFAULT?=	ccache
> # Possible values: 2, 3
> COROSYNC_DEFAULT?=	2
> # Possible_values: full canna nox devel_full devel_nox

Actions: View | Diff

Attachments on bug 252070: 220850 | 226428