diff options
| author |   Jakov Smolic <jakov.smolic@sartura.hr> | 2021-01-04 13:11:53 +0100 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2021-01-04 13:36:02 -0800 |
| commit | a6b56ff4eb6b6c3ab0cd48f2ad25b2ba16bfb54c (patch) | |
| tree | 04d4b497af3dfa1246c4f60de1297f7c8d69b6b2 | |
| parent | dev-libs/libbpf-0.3: Version bump (diff) | |
| download | gentoo-a6b56ff4.tar.gz gentoo-a6b56ff4.tar.bz2 gentoo-a6b56ff4.zip | |
dev-libs/libbpf: Fix 9999-paths.patch
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/18940
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
| -rw-r--r-- | dev-libs/libbpf/files/libbpf-9999-paths.patch | 12 | ||||
| -rw-r--r-- | 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 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 @@ diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild index 6697b1c3a061..3810c5b509d7 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() { |