From 88913a2cbd73714bf258abbc51de9531af3a7f80 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Wed, 23 Dec 2020 20:12:32 +0300 Subject: [PATCH] Mk: add new default-version variant for ccache --- 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 8aedf91b808f..bd580888d45c 100644 --- a/Mk/bsd.ccache.mk +++ b/Mk/bsd.ccache.mk @@ -38,7 +38,7 @@ WARNING+= WITH_CCACHE_BUILD support disabled, please set CCACHE_DIR. # Avoid depends loops between ccache and pkg . if !defined(NO_CCACHE_DEPEND) && \ ${PKGORIGIN} != ${PKG_ORIGIN} -BUILD_DEPENDS+= ${LOCALBASE}/bin/ccache:devel/ccache +BUILD_DEPENDS+= ${LOCALBASE}/bin/ccache:devel/${CCACHE_DEFAULT} . endif CCACHE_WRAPPER_PATH?= ${LOCALBASE}/libexec/ccache diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index d620d051061c..0f286b5ce761 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -37,6 +37,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?= ccahe # Possible values: 2, 3 COROSYNC_DEFAULT?= 2 # Possible_values: full canna nox devel_full devel_nox