commit: a6b56ff4eb6b6c3ab0cd48f2ad25b2ba16bfb54c Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Mon Jan 4 12:11:53 2021 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Mon Jan 4 21:36:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b56ff4
dev-libs/libbpf: Fix 9999-paths.patch Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/18940 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> dev-libs/libbpf/files/libbpf-9999-paths.patch | 12 ++++-------- dev-libs/libbpf/libbpf-9999.ebuild | 5 +++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dev-libs/libbpf/files/libbpf-9999-paths.patch b/dev-libs/libbpf/files/libbpf-9999-paths.patch index cbc267b64a3..ff087bb3871 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 @@ diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild index 6697b1c3a06..3810c5b509d 100644 --- a/dev-libs/libbpf/libbpf-9999.ebuild +++ b/dev-libs/libbpf/libbpf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,8 @@ src_compile() { BUILD_SHARED=y \ LIBSUBDIR="$(get_libdir)" \ $(usex static-libs 'BUILD_STATIC=y' '' '' '') \ - CC="$(tc-getCC)" + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" } src_install() {
