[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/

[Patrick McLean]

commit:     571c8878fb584ec49f1e22f064cb3e94f7123226
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 00:05:31 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 00:11:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571c8878

dev-libs/libbpf-0.1.0-r1: Compile static lib with -fPIC (needed for bcc)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../{libbpf-0.1.0.ebuild => libbpf-0.1.0-r1.ebuild}       | 15 +++++++++++----
 dev-libs/libbpf/libbpf-9999.ebuild                        |  8 ++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libbpf/libbpf-0.1.0.ebuild 
b/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild
similarity index 75%
rename from dev-libs/libbpf/libbpf-0.1.0.ebuild
rename to dev-libs/libbpf/libbpf-0.1.0-r1.ebuild
index 5ba31a42fe5..1c250842513 100644
--- a/dev-libs/libbpf/libbpf-0.1.0.ebuild
+++ b/dev-libs/libbpf/libbpf-0.1.0-r1.ebuild
@@ -3,16 +3,22 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/libbpf/libbpf.git";
+else
+       SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+S="${WORKDIR}/${P}/src"
 
 HOMEPAGE="https://github.com/libbpf/libbpf";
 DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/src"
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+static-libs"
 
 COMMON_DEPEND="virtual/libelf
@@ -26,6 +32,7 @@ PATCHES=(
 )
 
 src_compile() {
+       append-cflags -fPIC
        emake \
                BUILD_SHARED=y \
                LIBSUBDIR="$(get_libdir)" \

diff --git a/dev-libs/libbpf/libbpf-9999.ebuild 
b/dev-libs/libbpf/libbpf-9999.ebuild
index f363b55ec97..6697b1c3a06 100644
--- a/dev-libs/libbpf/libbpf-9999.ebuild
+++ b/dev-libs/libbpf/libbpf-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
+
 if [[ ${PV} =~ [9]{4,} ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/libbpf/libbpf.git";
@@ -13,7 +14,7 @@ else
 fi
 S="${WORKDIR}/${P}/src"
 
-HOMEPAGE="https://www.kernel.org/doc/html/latest/bpf/bpf_devel_QA.html";
+HOMEPAGE="https://github.com/libbpf/libbpf";
 DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
@@ -26,13 +27,12 @@ DEPEND="${COMMON_DEPEND}
        sys-kernel/linux-headers"
 RDEPEND="${COMMON_DEPEND}"
 
-S="${WORKDIR}/${P}/src"
-
 PATCHES=(
        "${FILESDIR}/libbpf-9999-paths.patch"
 )
 
 src_compile() {
+       append-cflags -fPIC
        emake \
                BUILD_SHARED=y \
                LIBSUBDIR="$(get_libdir)" \