From fab849d1daed0ba7f2ac497d07985c3dbb692543 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 16 Jun 2019 21:23:20 +0100
Subject: gentoo resync : 16.06.2019

---
 dev-libs/libbpf/files/libbpf-0.0.3-paths.patch     | 50 ++++++++++++++++++++++
 .../libbpf/files/libbpf-0.20190404-makefile.patch  | 16 -------
 dev-libs/libbpf/files/libbpf-makefile.patch        | 24 -----------
 3 files changed, 50 insertions(+), 40 deletions(-)
 create mode 100644 dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
 delete mode 100644 dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
 delete mode 100644 dev-libs/libbpf/files/libbpf-makefile.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
new file mode 100644
index 000000000000..8f905819f656
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
@@ -0,0 +1,50 @@
+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.20190404-makefile.patch b/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
deleted file mode 100644
index 7bfe5eb6335f..000000000000
--- a/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile b/src/Makefile
-index 35b4818..c034531 100644
---- a/Makefile
-+++ b/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) \
diff --git a/dev-libs/libbpf/files/libbpf-makefile.patch b/dev-libs/libbpf/files/libbpf-makefile.patch
deleted file mode 100644
index a98cbb8762b2..000000000000
--- a/dev-libs/libbpf/files/libbpf-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7ea1ff1..75ca998 100644
---- a/Makefile
-+++ b/Makefile
-@@ -22,7 +22,9 @@ 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
- ifdef BUILD_SHARED
- 	LIBS += $(OBJDIR)/libbpf.so
- endif
-@@ -52,7 +54,7 @@ $(OBJDIR)/libbpf.a: $(OBJS)
- 	$(AR) rcs $@ $^
- 
- $(OBJDIR)/libbpf.so: $(OBJS)
--	$(CC) -shared $(LDFLAGS) $^ -o $@
-+	$(CC) -shared $(LDFLAGS) $^ -Wl,-soname,libbpf.so -o $@
- 
- $(OBJDIR)/%.o: %.c
- 	$(CC) $(ALL_CFLAGS) -c $< -o $@
-- 
cgit v1.2.3