[gentoo-commits] repo/proj/guru:master commit in: dev-util/xdp-tools/, dev-util/xdp-tools/files/

[Theo Anderson]

commit:     23e4b9edb0150f2bd81301de5f8b4a95a5a9f221
Author:     Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sat Apr 24 10:38:51 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Apr 24 10:40:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=23e4b9ed

dev-util/xdp-tools: Drop old

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>

 dev-util/xdp-tools/Manifest                        |  1 -
 .../xdp-tools/files/xdp-tools-1.1.0-install.patch  | 38 ------------
 .../xdp-tools/files/xdp-tools-1.1.0-readelf.patch  | 52 ----------------
 dev-util/xdp-tools/xdp-tools-1.1.0.ebuild          | 70 ----------------------
 4 files changed, 161 deletions(-)

diff --git a/dev-util/xdp-tools/Manifest b/dev-util/xdp-tools/Manifest
index 0362a71ee..c8dff02a4 100644
--- a/dev-util/xdp-tools/Manifest
+++ b/dev-util/xdp-tools/Manifest
@@ -1,2 +1 @@
-DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232
 DIST xdp-tools-1.1.1.tar.gz 171627 BLAKE2B 5a2009f8b171d23a0f9b91b119e4376aecdddeb6d84c4323f05c03b382d4161c0d0364ef7a34b55771fe76c920b5bb18fe46c12d15c5356db6dc34174c5e5438 SHA512 580e87d7bfa7ee5b48caebceac4928386c3e3157ebb8d5cf1dd11a98187b9d17d027ef99f6598ce9b74eed7eb9b307195c4baa199675233d06c76bc8dc4861e5

diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch
deleted file mode 100644
index 702d555c6..000000000
--- a/dev-util/xdp-tools/files/xdp-tools-1.1.0-install.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@×××××××××××××.de>
-Date: Fri, 10 Apr 2020 15:39:13 +0200
-Subject: [PATCH] lib: xdp: make: Fix library install
-
-Two problems:
-
- * install doesn't handle symlinks
- * static libs are installed
-
-Fix it.
-
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
----
- lib/libxdp/Makefile | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
-index f45cc93c3076..2efe6bbea67a 100644
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -49,12 +49,11 @@ install: all
- 	$(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR)
- 	$(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/
- 	$(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/
--	$(Q)install -m 0755 $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
-+	$(Q)cp -a $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
- 	$(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR)
- 	$(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3)
- 	$(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3)
- 
--
- $(OBJDIR)/libxdp.a: $(STATIC_OBJS)
- 	$(QUIET_LINK)$(AR) rcs $@ $^
- 
--- 
-2.26.2
-

diff --git a/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch b/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch
deleted file mode 100644
index be68db3a8..000000000
--- a/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Kurt Kanzenbach <kurt@×××××××××××××.de>
-Subject: make: Fix hardcoded readelf
-
-Don't hardcode readelf. Allow to reuse something else.
-
-Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de>
-
----
- lib/libxdp/Makefile |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c
- 
- CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util
- BPF_CFLAGS += -I$(HEADER_DIR)
--
-+READELF ?= readelf
- 
- ifndef BUILD_STATIC_ONLY
- 	SHARED_LIBS := $(OBJDIR)/libxdp.so \
-@@ -88,12 +88,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE
- 
- XDP_IN_SHARED	:= $(SHARED_OBJDIR)/libxdp.o
- 
--GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \
-+GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \
- 			   cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
- 			   sed 's/\[.*\]//' | \
- 			   awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
- 			   sort -u | wc -l)
--VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \
-+VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \
- 			      grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l)
- 
- check: check_abi
-@@ -105,12 +105,12 @@ check_abi: $(OBJDIR)/libxdp.so
- 		     "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
- 		     "Please make sure all symbols are"	 \
- 		     "versioned in $(VERSION_SCRIPT)." >&2;		 \
--		readelf -s --wide $(XDP_IN_SHARED) |			 \
-+		$(READELF) -s --wide $(XDP_IN_SHARED) |			 \
- 		    cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' |	 \
- 		    sed 's/\[.*\]//' |					 \
- 		    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'|  \
- 		    sort -u > $(OUTPUT)libxdp_global_syms.tmp;		 \
--		readelf --dyn-syms --wide $(OUTPUT)libxdp.so |		 \
-+		$(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so |		 \
- 		    grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 |		 \
- 		    sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; 	 \
- 		diff -u $(OUTPUT)libxdp_global_syms.tmp			 \

diff --git a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
deleted file mode 100644
index 71dd1e00e..000000000
--- a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info llvm multilib toolchain-funcs
-
-DESCRIPTION="Utilities and example programs for use with XDP"
-HOMEPAGE="https://github.com/xdp-project/xdp-tools"
-SRC_URI="https://github.com/xdp-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-# skip strip for eBPF object files
-# tests have to be run as root
-RESTRICT="strip test"
-
-# skip QA check(s) for eBPF samples
-QA_EXECSTACK="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
-QA_PREBUILT="usr/lib*/bpf/*.o usr/share/xdp-tools/*.o"
-
-# XDP should be enabled
-CONFIG_CHECK="~XDP_SOCKETS"
-
-LLVM_MAX_SLOT=10
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-libs/libbpf-0.0.7
-	net-libs/libpcap
-	sys-libs/zlib
-	virtual/libelf
-"
-DEPEND="${RDEPEND}
-	sys-devel/clang:10
-	sys-devel/llvm:10
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-install.patch"
-	"${FILESDIR}/${P}-readelf.patch"
-)
-
-pkg_setup() {
-	llvm_pkg_setup
-}
-
-src_configure() {
-	./configure || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		READELF=$(tc-getREADELF) \
-		PRODUCTION=1 \
-		DYNAMIC_LIBXDP=1 \
-		FORCE_SYSTEM_LIBBPF=1 \
-		PREFIX=/usr \
-		LIBDIR="/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX=/usr LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
-}