From bd8d3b7a7f3d2fe50a997535617bfe902b2139ed Mon Sep 17 00:00:00 2001 From: YiFei Zhu Date: Fri, 18 Nov 2022 09:23:16 +0000 Subject: [PATCH] dev-libs/libbpf: Fix install in prefix Without this patch install would cause: * QA Notice: the following files are outside of the prefix: * /usr [...] * /usr/include/bpf/uapi/linux/bpf.h * /usr/include/bpf/libbpf_legacy.h * ERROR: dev-libs/libbpf-1.0.1::gentoo failed: * Aborting due to QA concerns: there are files installed outside the prefix I replaced the declaration of LIBDIR because it is default-initialized to: LIBDIR ?= $(PREFIX)/$(LIBSUBDIR) across all versions of libbpf versions with ebuild. Signed-off-by: YiFei Zhu Closes: https://github.com/gentoo/gentoo/pull/28323 Signed-off-by: Sam James --- dev-libs/libbpf/libbpf-0.8.1.ebuild | 4 +++- dev-libs/libbpf/libbpf-1.0.0-r1.ebuild | 2 +- dev-libs/libbpf/libbpf-1.0.1.ebuild | 2 +- dev-libs/libbpf/libbpf-9999.ebuild | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-libs/libbpf/libbpf-0.8.1.ebuild b/dev-libs/libbpf/libbpf-0.8.1.ebuild index 47b9e6026fa97..9050c1e4a1be8 100644 --- a/dev-libs/libbpf/libbpf-0.8.1.ebuild +++ b/dev-libs/libbpf/libbpf-0.8.1.ebuild @@ -34,7 +34,9 @@ PATCHES=( src_configure() { append-cflags -fPIC tc-export CC AR - export LIBSUBDIR="$(get_libdir)" V=1 + export LIBSUBDIR="$(get_libdir)" + export PREFIX="${EPREFIX}/usr" + export V=1 } src_install() { diff --git a/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild b/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild index d106d0c7a8631..d930f5e222090 100644 --- a/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild +++ b/dev-libs/libbpf/libbpf-1.0.0-r1.ebuild @@ -34,7 +34,7 @@ src_configure() { append-cflags -fPIC tc-export CC AR export LIBSUBDIR="$(get_libdir)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" + export PREFIX="${EPREFIX}/usr" export V=1 } diff --git a/dev-libs/libbpf/libbpf-1.0.1.ebuild b/dev-libs/libbpf/libbpf-1.0.1.ebuild index d106d0c7a8631..d930f5e222090 100644 --- a/dev-libs/libbpf/libbpf-1.0.1.ebuild +++ b/dev-libs/libbpf/libbpf-1.0.1.ebuild @@ -34,7 +34,7 @@ src_configure() { append-cflags -fPIC tc-export CC AR export LIBSUBDIR="$(get_libdir)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" + export PREFIX="${EPREFIX}/usr" export V=1 } diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild index d106d0c7a8631..d930f5e222090 100644 --- a/dev-libs/libbpf/libbpf-9999.ebuild +++ b/dev-libs/libbpf/libbpf-9999.ebuild @@ -34,7 +34,7 @@ src_configure() { append-cflags -fPIC tc-export CC AR export LIBSUBDIR="$(get_libdir)" - export LIBDIR="${EPREFIX}/usr/$(get_libdir)" + export PREFIX="${EPREFIX}/usr" export V=1 }