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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3EAD15808B for ; Wed, 6 Apr 2022 14:12:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD5F0E01B5; Wed, 6 Apr 2022 14:12:49 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 447D4E01B5 for ; Wed, 6 Apr 2022 14:12:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B6EDF3414D9 for ; Wed, 6 Apr 2022 14:12:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D7512A7 for ; Wed, 6 Apr 2022 14:12:46 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1649254363.d033a41e9d66ede9d09131cbbcd601621f2256ba.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-14.0.0.9999.ebuild sys-devel/clang/clang-15.0.0.9999.ebuild X-VCS-Directories: sys-devel/clang/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d033a41e9d66ede9d09131cbbcd601621f2256ba X-VCS-Branch: master Date: Wed, 6 Apr 2022 14:12:46 +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: 200840b6-31b3-4cdd-b8b6-d2249204ceaa X-Archives-Hash: 8fa9b879fab60166797c036065416988 commit: d033a41e9d66ede9d09131cbbcd601621f2256ba Author: Michał Górny gentoo org> AuthorDate: Wed Apr 6 14:12:19 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Apr 6 14:12:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d033a41e sys-devel/clang: Install clang-tidy headers The clang-tidy headers are apparently needed to build custom clang-tidy plugins, so install them. Since they aren't needed by anything in ::gentoo at the moment, limit the change to live ebuilds. I'll add it to ~arch when another 14.x revbump or release happens. TODO: split the header targets upstream to make it possible to install only a subset of generally useful headers rather than all the headers used by standard clang-tidy plugins. Signed-off-by: Michał Górny gentoo.org> sys-devel/clang/clang-14.0.0.9999.ebuild | 11 +++++++---- sys-devel/clang/clang-15.0.0.9999.ebuild | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sys-devel/clang/clang-14.0.0.9999.ebuild b/sys-devel/clang/clang-14.0.0.9999.ebuild index a30ff8ddf23e..4cb70129b171 100644 --- a/sys-devel/clang/clang-14.0.0.9999.ebuild +++ b/sys-devel/clang/clang-14.0.0.9999.ebuild @@ -105,10 +105,6 @@ check_distribution_components() { clang-libraries|distribution) continue ;; - # headers for clang-tidy static library - clang-tidy-headers) - continue - ;; # tools clang|clangd|clang-*) ;; @@ -194,6 +190,7 @@ get_distribution_components() { clang-query clang-reorder-fields clang-tidy + clang-tidy-headers clangd find-all-symbols modularize @@ -350,6 +347,7 @@ src_install() { # Move runtime headers to /usr/lib/clang, where they belong mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die # move (remaining) wrapped headers back + mv "${T}"/clang-tidy "${ED}"/usr/include/ || die mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die # Apply CHOST and version suffix to clang tools @@ -395,6 +393,11 @@ multilib_src_install() { rm -rf "${ED}"/usr/include || die mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die + if multilib_is_native_abi; then + # don't wrap clang-tidy headers, the list is too long + # (they're fine for non-native ABI but enabling the targets is problematic) + mv "${ED}"/usr/include/clang-tidy "${T}/" || die + fi } multilib_src_install_all() { diff --git a/sys-devel/clang/clang-15.0.0.9999.ebuild b/sys-devel/clang/clang-15.0.0.9999.ebuild index a30ff8ddf23e..4cb70129b171 100644 --- a/sys-devel/clang/clang-15.0.0.9999.ebuild +++ b/sys-devel/clang/clang-15.0.0.9999.ebuild @@ -105,10 +105,6 @@ check_distribution_components() { clang-libraries|distribution) continue ;; - # headers for clang-tidy static library - clang-tidy-headers) - continue - ;; # tools clang|clangd|clang-*) ;; @@ -194,6 +190,7 @@ get_distribution_components() { clang-query clang-reorder-fields clang-tidy + clang-tidy-headers clangd find-all-symbols modularize @@ -350,6 +347,7 @@ src_install() { # Move runtime headers to /usr/lib/clang, where they belong mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die # move (remaining) wrapped headers back + mv "${T}"/clang-tidy "${ED}"/usr/include/ || die mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die # Apply CHOST and version suffix to clang tools @@ -395,6 +393,11 @@ multilib_src_install() { rm -rf "${ED}"/usr/include || die mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die + if multilib_is_native_abi; then + # don't wrap clang-tidy headers, the list is too long + # (they're fine for non-native ABI but enabling the targets is problematic) + mv "${ED}"/usr/include/clang-tidy "${T}/" || die + fi } multilib_src_install_all() {