Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Oct 2021 12:05:36 GMT
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 79ac62f35b15 - main - Mk/bsd.port.mk: Export XDG_CACHE_HOME
Message-ID:  <202110061205.196C5apn026855@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=79ac62f35b153e536185a32d12366dc0ccdc1245

commit 79ac62f35b153e536185a32d12366dc0ccdc1245
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-10-06 08:58:20 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-10-06 12:01:52 +0000

    Mk/bsd.port.mk: Export XDG_CACHE_HOME
    
    This adds XDG_CACHE_HOME to the set of XDG_* variables exported in
    CONFIGURE_ENV and MAKE_ENV.
    
    Without XDG_CACHE_HOME in the environment some software (for ex.
    https://github.com/coursier/coursier) falls back to using
    /home/{user}/.cache during the build and writes outside the working
    directory.
    
    XDG_CACHE_HOME is described in the XDG Base Directory Specification:
    https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
    
    PR:             255600
    Exp-run by:     antoine
---
 Mk/Uses/gnome.mk | 2 +-
 Mk/bsd.port.mk   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 115b6460c24c..66d7f4d0169c 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -215,7 +215,7 @@ introspection_BUILD_DEPENDS=	g-ir-scanner:devel/gobject-introspection
 introspection_LIB_DEPENDS=	libgirepository-1.0.so:devel/gobject-introspection
 introspection_RUN_DEPENDS=	g-ir-scanner:devel/gobject-introspection
 introspection_USE_GNOME_IMPL=	glib20
-introspection_MAKE_ENV=		GI_SCANNER_DISABLE_CACHE=1 XDG_CACHE_HOME=${WRKDIR}
+introspection_MAKE_ENV=		GI_SCANNER_DISABLE_CACHE=1
 
 gconf2_LIB_DEPENDS=	libgconf-2.so:devel/gconf2
 gconf2_USE_GNOME_IMPL=	orbit2 libxml2 gtk20
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 866f45586523..a0f19bd77697 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1623,9 +1623,11 @@ TEST_ENV?=		${MAKE_ENV}
 PKG_ENV+=		PORTSDIR=${PORTSDIR}
 CONFIGURE_ENV+=	XDG_DATA_HOME=${WRKDIR} \
 				XDG_CONFIG_HOME=${WRKDIR} \
+				XDG_CACHE_HOME=${WRKDIR}/.cache \
 				HOME=${WRKDIR}
 MAKE_ENV+=		XDG_DATA_HOME=${WRKDIR} \
 				XDG_CONFIG_HOME=${WRKDIR} \
+				XDG_CACHE_HOME=${WRKDIR}/.cache \
 				HOME=${WRKDIR}
 # Respect TMPDIR passed via make.conf or similar and pass it down
 # to configure and make.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110061205.196C5apn026855>