| 1 |
commit: 33d6cebd06e2d9c041cdc48b242102edb1d852e8 |
| 2 |
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de> |
| 3 |
AuthorDate: Sat Apr 24 10:18:01 2021 +0000 |
| 4 |
Commit: Theo Anderson <telans <AT> posteo <DOT> de> |
| 5 |
CommitDate: Sat Apr 24 10:18:01 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=33d6cebd |
| 7 |
|
| 8 |
dev-util/xdp-tools: Don't call readelf directly |
| 9 |
|
| 10 |
Allow to override it. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/785214 |
| 13 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
| 14 |
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de> |
| 15 |
|
| 16 |
.../xdp-tools/files/xdp-tools-1.1.0-readelf.patch | 52 ++++++++++++++++++++++ |
| 17 |
dev-util/xdp-tools/xdp-tools-1.1.0.ebuild | 6 ++- |
| 18 |
2 files changed, 57 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 000000000..be68db3a8 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-util/xdp-tools/files/xdp-tools-1.1.0-readelf.patch |
| 25 |
@@ -0,0 +1,52 @@ |
| 26 |
+From: Kurt Kanzenbach <kurt@×××××××××××××.de> |
| 27 |
+Subject: make: Fix hardcoded readelf |
| 28 |
+ |
| 29 |
+Don't hardcode readelf. Allow to reuse something else. |
| 30 |
+ |
| 31 |
+Signed-off-by: Kurt Kanzenbach <kurt@×××××××××××××.de> |
| 32 |
+ |
| 33 |
+--- |
| 34 |
+ lib/libxdp/Makefile | 10 +++++----- |
| 35 |
+ 1 file changed, 5 insertions(+), 5 deletions(-) |
| 36 |
+ |
| 37 |
+--- a/lib/libxdp/Makefile |
| 38 |
++++ b/lib/libxdp/Makefile |
| 39 |
+@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c |
| 40 |
+ |
| 41 |
+ CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util |
| 42 |
+ BPF_CFLAGS += -I$(HEADER_DIR) |
| 43 |
+- |
| 44 |
++READELF ?= readelf |
| 45 |
+ |
| 46 |
+ ifndef BUILD_STATIC_ONLY |
| 47 |
+ SHARED_LIBS := $(OBJDIR)/libxdp.so \ |
| 48 |
+@@ -88,12 +88,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE |
| 49 |
+ |
| 50 |
+ XDP_IN_SHARED := $(SHARED_OBJDIR)/libxdp.o |
| 51 |
+ |
| 52 |
+-GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \ |
| 53 |
++GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \ |
| 54 |
+ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ |
| 55 |
+ sed 's/\[.*\]//' | \ |
| 56 |
+ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ |
| 57 |
+ sort -u | wc -l) |
| 58 |
+-VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \ |
| 59 |
++VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \ |
| 60 |
+ grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l) |
| 61 |
+ |
| 62 |
+ check: check_abi |
| 63 |
+@@ -105,12 +105,12 @@ check_abi: $(OBJDIR)/libxdp.so |
| 64 |
+ "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \ |
| 65 |
+ "Please make sure all symbols are" \ |
| 66 |
+ "versioned in $(VERSION_SCRIPT)." >&2; \ |
| 67 |
+- readelf -s --wide $(XDP_IN_SHARED) | \ |
| 68 |
++ $(READELF) -s --wide $(XDP_IN_SHARED) | \ |
| 69 |
+ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ |
| 70 |
+ sed 's/\[.*\]//' | \ |
| 71 |
+ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ |
| 72 |
+ sort -u > $(OUTPUT)libxdp_global_syms.tmp; \ |
| 73 |
+- readelf --dyn-syms --wide $(OUTPUT)libxdp.so | \ |
| 74 |
++ $(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so | \ |
| 75 |
+ grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | \ |
| 76 |
+ sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; \ |
| 77 |
+ diff -u $(OUTPUT)libxdp_global_syms.tmp \ |
| 78 |
|
| 79 |
diff --git a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild |
| 80 |
index 1f4477a5d..71dd1e00e 100644 |
| 81 |
--- a/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild |
| 82 |
+++ b/dev-util/xdp-tools/xdp-tools-1.1.0.ebuild |
| 83 |
@@ -40,7 +40,10 @@ DEPEND="${RDEPEND} |
| 84 |
sys-devel/llvm:10 |
| 85 |
" |
| 86 |
|
| 87 |
-PATCHES=( "${FILESDIR}/${P}-install.patch" ) |
| 88 |
+PATCHES=( |
| 89 |
+ "${FILESDIR}/${P}-install.patch" |
| 90 |
+ "${FILESDIR}/${P}-readelf.patch" |
| 91 |
+) |
| 92 |
|
| 93 |
pkg_setup() { |
| 94 |
llvm_pkg_setup |
| 95 |
@@ -54,6 +57,7 @@ src_compile() { |
| 96 |
emake \ |
| 97 |
CC="$(tc-getCC)" \ |
| 98 |
AR="$(tc-getAR)" \ |
| 99 |
+ READELF=$(tc-getREADELF) \ |
| 100 |
PRODUCTION=1 \ |
| 101 |
DYNAMIC_LIBXDP=1 \ |
| 102 |
FORCE_SYSTEM_LIBBPF=1 \ |
Archives