From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1199635-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id AEC16138359
for <garchives@archives.gentoo.org>; Tue, 25 Aug 2020 00:11:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F2B66E087E;
Tue, 25 Aug 2020 00:11:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DF40BE087E
for <gentoo-commits@lists.gentoo.org>; Tue, 25 Aug 2020 00:11:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 141B3335D7F
for <gentoo-commits@lists.gentoo.org>; Tue, 25 Aug 2020 00:11:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ADF77330
for <gentoo-commits@lists.gentoo.org>; Tue, 25 Aug 2020 00:11:42 +0000 (UTC)
From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" <chutzpah@gentoo.org>
Message-ID: <1598314294.571c8878fb584ec49f1e22f064cb3e94f7123226.chutzpah@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/libbpf/libbpf-0.1.0-r1.ebuild dev-libs/libbpf/libbpf-0.1.0.ebuild dev-libs/libbpf/libbpf-9999.ebuild
X-VCS-Directories: dev-libs/libbpf/
X-VCS-Committer: chutzpah
X-VCS-Committer-Name: Patrick McLean
X-VCS-Revision: 571c8878fb584ec49f1e22f064cb3e94f7123226
X-VCS-Branch: master
Date: Tue, 25 Aug 2020 00:11:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 992e4ed5-5696-47c7-bd04-7c84ab93162c
X-Archives-Hash: 0c012bacb183a2f6291f1e9c516edbc2
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)" \