summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/libbpf/files/libbpf-9999-paths.patch')
-rw-r--r--dev-libs/libbpf/files/libbpf-9999-paths.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/dev-libs/libbpf/files/libbpf-9999-paths.patch b/dev-libs/libbpf/files/libbpf-9999-paths.patch
index cbc267b64a38..ff087bb38712 100644
--- a/dev-libs/libbpf/files/libbpf-9999-paths.patch
+++ b/dev-libs/libbpf/files/libbpf-9999-paths.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile b/Makefile
-index bc25aba..e1db3d6 100644
--- a/Makefile
+++ b/Makefile
-@@ -66,7 +66,7 @@ endif
+@@ -76,7 +76,7 @@ endif
PREFIX ?= /usr
LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
INCLUDEDIR ?= $(PREFIX)/include
@@ -11,16 +9,14 @@ index bc25aba..e1db3d6 100644
TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
-@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
+@@ -101,6 +101,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
$(OBJDIR)/libbpf.pc:
- sed -e "s|@PREFIX@|$(PREFIX)|" \
- -e "s|@LIBDIR@|$(LIBDIR)|" \
+ $(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \
+ -e "s|@LIBDIR@|$(LIBDIR_PC)|" \
+ -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 @@