From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 29 Feb 2020 18:01:47 +0000
Subject: gentoo (leap year) resync : 29.02.2020

---
 dev-libs/libbpf/files/libbpf-0.0.3-paths.patch | 50 --------------------------
 dev-libs/libbpf/files/libbpf-0.0.7-paths.patch | 38 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 50 deletions(-)
 delete mode 100644 dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
 create mode 100644 dev-libs/libbpf/files/libbpf-0.0.7-paths.patch

(limited to 'dev-libs/libbpf/files')

diff --git a/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
deleted file mode 100644
index 8f905819f656..000000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Makefile b/src/Makefile
-index 82a650c..549779d 100644
---- a/Makefile
-+++ b/src/Makefile
-@@ -36,7 +36,10 @@ OBJDIR ?= .
- OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
- 	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o)
- 
--LIBS := $(OBJDIR)/libbpf.a
-+ifdef BUILD_STATIC
-+	LIBS := $(OBJDIR)/libbpf.a
-+endif
-+
- ifndef BUILD_STATIC_ONLY
- 	LIBS += $(OBJDIR)/libbpf.so \
- 		$(OBJDIR)/libbpf.so.$(VERSION) \
-@@ -63,7 +66,7 @@ endif
- PREFIX ?= /usr
- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
- INCLUDEDIR ?= $(PREFIX)/include
--UAPIDIR ?= $(PREFIX)/include
-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi
- 
- all: $(LIBS) $(PC_FILE)
- 
-@@ -84,6 +87,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(OBJS)
- $(OBJDIR)/libbpf.pc:
- 	sed -e "s|@PREFIX@|$(PREFIX)|" \
- 		-e "s|@LIBDIR@|$(LIBDIR)|" \
-+		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
- 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
- 		< libbpf.pc.template > $@
- 
-diff --git a/libbpf.pc.template b/src/libbpf.pc.template
-index ac17fce..6d385d9 100644
---- a/libbpf.pc.template
-+++ b/src/libbpf.pc.template
-@@ -3,10 +3,11 @@
- prefix=@PREFIX@
- libdir=@LIBDIR@
- includedir=${prefix}/include
-+uapidir=@UAPIDIR@
- 
- Name: libbpf
- Description: BPF library
- Version: @VERSION@
- Libs: -L${libdir} -lbpf
- Requires.private: libelf
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${uapidir}
diff --git a/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
new file mode 100644
index 000000000000..cbc267b64a38
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index bc25aba..e1db3d6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@ endif
+ PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
+ INCLUDEDIR ?= $(PREFIX)/include
+-UAPIDIR ?= $(PREFIX)/include
++UAPIDIR ?= $(PREFIX)/include/bpf/uapi
+ 
+ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
+ 
+@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
+ $(OBJDIR)/libbpf.pc:
+ 	sed -e "s|@PREFIX@|$(PREFIX)|" \
+ 		-e "s|@LIBDIR@|$(LIBDIR)|" \
++		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
+ 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
+ 		< libbpf.pc.template > $@
+ 
+diff --git a/libbpf.pc.template b/libbpf.pc.template
+index b45ed53..5ec63c2 100644
+--- a/libbpf.pc.template
++++ b/libbpf.pc.template
+@@ -3,10 +3,11 @@
+ prefix=@PREFIX@
+ libdir=@LIBDIR@
+ includedir=${prefix}/include
++uapidir=@UAPIDIR@
+ 
+ Name: libbpf
+ Description: BPF library
+ Version: @VERSION@
+ Libs: -L${libdir} -lbpf
+ Requires.private: libelf zlib
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${uapidir}
-- 
cgit v1.2.3