From nobody Wed Oct 06 12:05:36 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 62C5D12D73FF; Wed, 6 Oct 2021 12:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HPY7P1R5sz4vSQ; Wed, 6 Oct 2021 12:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 106251F46A; Wed, 6 Oct 2021 12:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 196C5al9026856; Wed, 6 Oct 2021 12:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 196C5apn026855; Wed, 6 Oct 2021 12:05:36 GMT (envelope-from git) Date: Wed, 6 Oct 2021 12:05:36 GMT Message-Id: <202110061205.196C5apn026855@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 79ac62f35b15 - main - Mk/bsd.port.mk: Export XDG_CACHE_HOME List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79ac62f35b153e536185a32d12366dc0ccdc1245 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=79ac62f35b153e536185a32d12366dc0ccdc1245 commit 79ac62f35b153e536185a32d12366dc0ccdc1245 Author: Yuri Victorovich AuthorDate: 2021-10-06 08:58:20 +0000 Commit: Tobias Kortkamp 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.