From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 678C315812D for ; Fri, 03 Jan 2025 15:25:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB098E0824; Fri, 03 Jan 2025 15:25:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D995BE0824 for ; Fri, 03 Jan 2025 15:25:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F106D335C52 for ; Fri, 03 Jan 2025 15:25:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F77997F for ; Fri, 03 Jan 2025 15:25:26 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1735917893.4481d9d842856499e8fef19430f8fe835e626c48.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: llvm-core/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: llvm-core/clang/clang-19.1.6.ebuild llvm-core/clang/clang-20.0.0.9999.ebuild llvm-core/clang/clang-20.0.0_pre20241227.ebuild X-VCS-Directories: llvm-core/clang/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 4481d9d842856499e8fef19430f8fe835e626c48 X-VCS-Branch: master Date: Fri, 03 Jan 2025 15:25:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e7947582-7022-4f0a-934c-06e4224f163b X-Archives-Hash: fad6a178539a2e1289e87b577ca5cc08 commit: 4481d9d842856499e8fef19430f8fe835e626c48 Author: James Le Cuirot gentoo org> AuthorDate: Fri Jan 3 13:53:55 2025 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Fri Jan 3 15:24:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4481d9d8 llvm-core/clang: Set CLANG_CONFIG_FILE_USER_DIR for per-user config This is a better way to pass dynamic flags like --sysroot when cross-compiling than sticking them directly in variables like CC. The HOME directory is overridden by Portage, so real user config won't interfere with package builds. For now, the necessary config can be set up in pre_src_unpack, but perhaps we could come up with something more formal later. Closes: https://github.com/gentoo/gentoo/pull/39960 Signed-off-by: James Le Cuirot gentoo.org> llvm-core/clang/clang-19.1.6.ebuild | 3 ++- llvm-core/clang/clang-20.0.0.9999.ebuild | 3 ++- llvm-core/clang/clang-20.0.0_pre20241227.ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/llvm-core/clang/clang-19.1.6.ebuild b/llvm-core/clang/clang-19.1.6.ebuild index 3d00c48770d8..d21a4ba71610 100644 --- a/llvm-core/clang/clang-19.1.6.ebuild +++ b/llvm-core/clang/clang-19.1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -260,6 +260,7 @@ multilib_src_configure() { -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" -DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang" + -DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang" # relative to bindir -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}" diff --git a/llvm-core/clang/clang-20.0.0.9999.ebuild b/llvm-core/clang/clang-20.0.0.9999.ebuild index ffc1eb222985..67e6515db8b5 100644 --- a/llvm-core/clang/clang-20.0.0.9999.ebuild +++ b/llvm-core/clang/clang-20.0.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -259,6 +259,7 @@ multilib_src_configure() { -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" -DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang" + -DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang" # relative to bindir -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}" diff --git a/llvm-core/clang/clang-20.0.0_pre20241227.ebuild b/llvm-core/clang/clang-20.0.0_pre20241227.ebuild index ffc1eb222985..67e6515db8b5 100644 --- a/llvm-core/clang/clang-20.0.0_pre20241227.ebuild +++ b/llvm-core/clang/clang-20.0.0_pre20241227.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -259,6 +259,7 @@ multilib_src_configure() { -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" -DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang" + -DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang" # relative to bindir -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"