From 1aa2b13616010bed25b66262434e765dbf86b5e9 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 11 Nov 2024 16:50:13 +0100 Subject: [PATCH] overlay profiles: Mask llvm USE flags for sys-devel/bpftool --- .../profiles/coreos/base/package.use.mask | 5 +++++ .../coreos-overlay/profiles/coreos/base/use.mask | 11 ----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask index 0e3644833e..ba6b95c172 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask @@ -25,3 +25,8 @@ sys-fs/btrfs-progs man # put anywhere. Thus avoid pulling more dependencies than necessary # for throw-away things. dev-python/pillow jpeg + +# bpftool ebuild started to bdepend on sys-devel/clang unconditionally +# in order to build co-re support. We can try avoiding it by masking +# the USE flag that currently gets enabled by default. +dev-util/bpftool llvm_slot_18 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask index 485c9832eb..726c8edc2e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask @@ -21,14 +21,3 @@ python_single_target_python3_13 # We don't care about i10n, takes too much space, pulls in too many # extra dependencies. nls - -# Mask llvm slot USE flags generated by llvm-r1 eclass. Recently -# dev-util/bpftool started pulling in clang unconditionally (with -# llvm_gen_dep) as a build dependency. Masking the USE flags may help -# us avoid having the dependency until we decide to get llvm/clang -# into SDK. -llvm_slot_15 -llvm_slot_16 -llvm_slot_17 -llvm_slot_18 -llvm_slot_19