[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftool/, dev-util/bpftool/files/

[Sam James]

commit:     de78decd557db68c05c7b57875acf77c04281a79
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 10:24:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 10:24:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de78decd

dev-util/bpftool: avoid duplicate patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/bpftool/bpftool-6.0.12.ebuild                 |  2 +-
 dev-util/bpftool/files/6.0.12-no-stack-protector.patch | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dev-util/bpftool/bpftool-6.0.12.ebuild 
b/dev-util/bpftool/bpftool-6.0.12.ebuild
index 5e3c53bae36d..0ea6f12c98cd 100644
--- a/dev-util/bpftool/bpftool-6.0.12.ebuild
+++ b/dev-util/bpftool/bpftool-6.0.12.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 
        pushd "${S_K}" >/dev/null || die
        # bug #890638
-       eapply "${FILESDIR}"/${PV}-no-stack-protector.patch
+       eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
        popd || die
 
        # dev-python/docutils installs rst2man.py, not rst2man

diff --git a/dev-util/bpftool/files/6.0.12-no-stack-protector.patch 
b/dev-util/bpftool/files/6.0.12-no-stack-protector.patch
deleted file mode 100644
index c9ae115ac20d..000000000000
--- a/dev-util/bpftool/files/6.0.12-no-stack-protector.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-https://bugs.gentoo.org/890638
-
---- a/tools/bpf/bpftool/Makefile       2022-12-11 23:15:18.000000000 +0100
-+++ b/tools/bpf/bpftool/Makefile       2023-01-13 10:32:09.615048492 +0100
-@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT
-               -I$(or $(OUTPUT),.) \
-               -I$(srctree)/tools/include/uapi/ \
-               -I$(LIBBPF_BOOTSTRAP_INCLUDE) \
--              -g -O2 -Wall -target bpf -c $< -o $@
-+              -g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@
-       $(Q)$(LLVM_STRIP) -g $@
- 
- $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP)