summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <patrick.mclean@sony.com>2019-06-14 13:58:41 -0700
committerPatrick McLean <chutzpah@gentoo.org>2019-06-14 14:03:35 -0700
commit97ee7b866fe6d8537f18912ca72ff91387f3c5c3 (patch)
tree3ada8bc2284acbb20a8ddcf76f48eb01c49e0350 /dev-libs/libbpf/files
parentmedia-gfx/inkscape: 0.92.4 ppc64 stable (diff)
downloadgentoo-97ee7b866fe6d8537f18912ca72ff91387f3c5c3.tar.gz
gentoo-97ee7b866fe6d8537f18912ca72ff91387f3c5c3.tar.bz2
gentoo-97ee7b866fe6d8537f18912ca72ff91387f3c5c3.zip
dev-libs/libbpf: Version bump to 0.0.3
Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'dev-libs/libbpf/files')
-rw-r--r--dev-libs/libbpf/files/libbpf-0.0.3-paths.patch50
1 files changed, 50 insertions, 0 deletions
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}