diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-08 11:28:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-08 11:28:34 +0000 |
| commit | 24fd814c326e282c4321965c31f341dad77e270d (patch) | |
| tree | 033d63b33c21a3209964ab56005bb9bdd523630d /dev-libs/libbpf/files | |
| parent | 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff) | |
gentoo resync : 08.01.2021
Diffstat (limited to 'dev-libs/libbpf/files')
| -rw-r--r-- | dev-libs/libbpf/files/libbpf-0.3.0-paths.patch | 34 | ||||
| -rw-r--r-- | dev-libs/libbpf/files/libbpf-9999-paths.patch | 12 |
2 files changed, 38 insertions, 8 deletions
diff --git a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch new file mode 100644 index 000000000000..ff087bb38712 --- /dev/null +++ b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch @@ -0,0 +1,34 @@ +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,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) + +@@ -101,6 +101,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS) + $(OBJDIR)/libbpf.pc: + $(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \ + -e "s|@LIBDIR@|$(LIBDIR_PC)|" \ ++ -e "s|@UAPIDIR@|$(UAPIDIR)|" \ + -e "s|@VERSION@|$(LIBBPF_VERSION)|" \ + < libbpf.pc.template > $@ + +--- 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} 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 @@ |