From 7f8fe119ff3651877453671ffc8ebef6e224ff4f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 12 Jan 2026 07:12:20 +0000 Subject: [PATCH] dev-util/bpftool: Sync with Gentoo It's from Gentoo commit c85a2108c082e6122fec344ed997fdbdfd9a2740. Signed-off-by: Flatcar Buildbot --- .../portage-stable/dev-util/bpftool/bpftool-7.6.0.ebuild | 7 +++++-- .../portage-stable/dev-util/bpftool/bpftool-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-7.6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-7.6.0.ebuild index b835449a25..8a8995dca6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-7.6.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-7.6.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( {15..20} ) +LLVM_COMPAT=( {15..21} ) LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{11..14} ) @@ -86,7 +86,10 @@ src_prepare() { sed -i -e 's/-Werror//g' src/Makefile.feature || die # remove hardcoded/unhelpful flags from bpftool - sed -i -e '/CFLAGS += -O2/d' -e 's/-W //g' -e 's/-Wextra //g' src/Makefile || die + sed -e '/CFLAGS += -O2$/d' \ + -e '/CFLAGS += -W$/d' \ + -e '/CFLAGS += -Wextra$/d' \ + -i src/Makefile || die # always build bpf bits with std=gnu11 for kernel compatibility (bug 955156) sed -i 's/-fno-stack-protector/& -std=gnu11/g' src/Makefile || die diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-9999.ebuild index ffb93ed0b0..3f8d05a605 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( {15..20} ) +LLVM_COMPAT=( {15..21} ) LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{11..14} ) @@ -86,7 +86,10 @@ src_prepare() { sed -i -e 's/-Werror//g' src/Makefile.feature || die # remove hardcoded/unhelpful flags from bpftool - sed -i -e '/CFLAGS += -O2/d' -e 's/-W //g' -e 's/-Wextra //g' src/Makefile || die + sed -e '/CFLAGS += -O2$/d' \ + -e '/CFLAGS += -W$/d' \ + -e '/CFLAGS += -Wextra$/d' \ + -i src/Makefile || die # always build bpf bits with std=gnu11 for kernel compatibility (bug 955156) sed -i 's/-fno-stack-protector/& -std=gnu11/g' src/Makefile || die