public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/, dev-libs/libbpf/files/
@ 2019-04-04 22:27 Patrick McLean
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2019-04-04 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     389ef0393e966b8367e6d0dfd8404ce35352a37e
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Apr  4 22:26:51 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 22:27:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389ef039

dev-libs/libbpf: Version bump to 0.20190404

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/libbpf/Manifest                           |  1 +
 .../libbpf/files/libbpf-0.20190404-makefile.patch  | 16 +++++
 dev-libs/libbpf/libbpf-0.20190404.ebuild           | 68 ++++++++++++++++++++++
 3 files changed, 85 insertions(+)

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 27e7e9bf4c9..eed781dd6e0 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1 +1,2 @@
 DIST libbpf-0.20190311.tar.gz 110782 BLAKE2B b660b2677abd3068aa37f390e817c755ee06cf683e357cad6a9537d8e509d53f24ac66e472148f5b66cbcdca7849db10fc34ff8e6f85bd54a0570a52846ff933 SHA512 dbac8efce3b4c6d4faf40b22de6f71bee630fc8b71aa96e13692ffff0474ed7aa5f66a3c1f5871ec1c27dc71b87bec3ce5138096590fb9238d4d696a722f358d
+DIST libbpf-0.20190404.tar.gz 115495 BLAKE2B a159d75163cee051e7784c20018020e650d88e3b011928b1a748199f88b22de713000d3557d083cbbfc3450b6ded9b891d0afb487611044cf2af93fd5691ff8c SHA512 724fe12c9a028a9b6d5a05ee679a3c7f687a32f403bbee3c90730005dac20e0a5e9e6c21df02780d329a88acf4ec525411e448f537b49ce2767de8eae6012661

diff --git a/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch b/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
new file mode 100644
index 00000000000..7bfe5eb6335
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/src/Makefile
+index 35b4818..c034531 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,10 @@ OBJDIR ?= .
+ OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
+ 	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o)
+
+-LIBS := $(OBJDIR)/libbpf.a
++ifdef BUILD_STATIC
++	LIBS := $(OBJDIR)/libbpf.a
++endif
++
+ ifndef BUILD_STATIC_ONLY
+ 	LIBS += $(OBJDIR)/libbpf.so \
+ 		$(OBJDIR)/libbpf.so.$(VERSION) \

diff --git a/dev-libs/libbpf/libbpf-0.20190404.ebuild b/dev-libs/libbpf/libbpf-0.20190404.ebuild
new file mode 100644
index 00000000000..2ffb199b195
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.20190404.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="7c27c6306160f630c3c4f4b4971deb657126d681"
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.20190404-makefile.patch"
+)
+
+src_prepare() {
+	# upstream doesn't provide a pkgconfig file, so
+	# let's make one
+	printf 'prefix=/usr\nexec_prefix=${prefix}\nlibdir=%s\n' \
+			"/usr/$(get_libdir)" \
+		> ${PN}.pc
+	printf 'includedir=${prefix}/include\n\n' \
+		>> ${PN}.pc
+
+	printf 'Name: %s\nDescription: %s\nVersion: %s\nLibs: -lbpf %s\n' \
+			"${PN}" \
+			"${DESCRIPTION}" \
+			"${PV}" \
+			"$($(tc-getPKG_CONFIG) --libs libelf)" \
+		>> ${PN}.pc
+
+	default
+}
+
+src_compile() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/, dev-libs/libbpf/files/
@ 2019-06-14 21:03 Patrick McLean
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2019-06-14 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     14eef1a2086ca095ae140982ead455c1a42d5efe
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Fri Jun 14 21:00:34 2019 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 21:03:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14eef1a2

dev-libs/libbpf: Remove old snapshots

This is to force an upgrade to 0.0.3, which portage evaluates
as older than the currently existing snapshots.

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/libbpf/Manifest                           |  2 -
 .../libbpf/files/libbpf-0.20190404-makefile.patch  | 16 -----
 dev-libs/libbpf/files/libbpf-makefile.patch        | 24 --------
 dev-libs/libbpf/libbpf-0.20190311.ebuild           | 68 ----------------------
 dev-libs/libbpf/libbpf-0.20190404.ebuild           | 68 ----------------------
 5 files changed, 178 deletions(-)

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index bd324ded2d4..54697cb1a74 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,3 +1 @@
 DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad
-DIST libbpf-0.20190311.tar.gz 110782 BLAKE2B b660b2677abd3068aa37f390e817c755ee06cf683e357cad6a9537d8e509d53f24ac66e472148f5b66cbcdca7849db10fc34ff8e6f85bd54a0570a52846ff933 SHA512 dbac8efce3b4c6d4faf40b22de6f71bee630fc8b71aa96e13692ffff0474ed7aa5f66a3c1f5871ec1c27dc71b87bec3ce5138096590fb9238d4d696a722f358d
-DIST libbpf-0.20190404.tar.gz 115495 BLAKE2B a159d75163cee051e7784c20018020e650d88e3b011928b1a748199f88b22de713000d3557d083cbbfc3450b6ded9b891d0afb487611044cf2af93fd5691ff8c SHA512 724fe12c9a028a9b6d5a05ee679a3c7f687a32f403bbee3c90730005dac20e0a5e9e6c21df02780d329a88acf4ec525411e448f537b49ce2767de8eae6012661

diff --git a/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch b/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
deleted file mode 100644
index 7bfe5eb6335..00000000000
--- a/dev-libs/libbpf/files/libbpf-0.20190404-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile b/src/Makefile
-index 35b4818..c034531 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,10 @@ OBJDIR ?= .
- OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
- 	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o)
-
--LIBS := $(OBJDIR)/libbpf.a
-+ifdef BUILD_STATIC
-+	LIBS := $(OBJDIR)/libbpf.a
-+endif
-+
- ifndef BUILD_STATIC_ONLY
- 	LIBS += $(OBJDIR)/libbpf.so \
- 		$(OBJDIR)/libbpf.so.$(VERSION) \

diff --git a/dev-libs/libbpf/files/libbpf-makefile.patch b/dev-libs/libbpf/files/libbpf-makefile.patch
deleted file mode 100644
index a98cbb8762b..00000000000
--- a/dev-libs/libbpf/files/libbpf-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7ea1ff1..75ca998 100644
---- a/Makefile
-+++ b/Makefile
-@@ -22,7 +22,9 @@ OBJDIR ?= .
- OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
- 	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o)
- 
--LIBS := $(OBJDIR)/libbpf.a
-+ifdef BUILD_STATIC
-+	LIBS := $(OBJDIR)/libbpf.a
-+endif
- ifdef BUILD_SHARED
- 	LIBS += $(OBJDIR)/libbpf.so
- endif
-@@ -52,7 +54,7 @@ $(OBJDIR)/libbpf.a: $(OBJS)
- 	$(AR) rcs $@ $^
- 
- $(OBJDIR)/libbpf.so: $(OBJS)
--	$(CC) -shared $(LDFLAGS) $^ -o $@
-+	$(CC) -shared $(LDFLAGS) $^ -Wl,-soname,libbpf.so -o $@
- 
- $(OBJDIR)/%.o: %.c
- 	$(CC) $(ALL_CFLAGS) -c $< -o $@

diff --git a/dev-libs/libbpf/libbpf-0.20190311.ebuild b/dev-libs/libbpf/libbpf-0.20190311.ebuild
deleted file mode 100644
index 114e79ca5a3..00000000000
--- a/dev-libs/libbpf/libbpf-0.20190311.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2019 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-EGIT_COMMIT="cb658e9724e3c34973eee913b1ff0cb9c50b8e53"
-
-HOMEPAGE="https://github.com/libbpf/libbpf"
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-COMMON_DEPEND="virtual/libelf
-	!<=dev-util/bcc-0.7.0"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}/src"
-
-PATCHES=(
-	"${FILESDIR}/libbpf-makefile.patch"
-)
-
-src_prepare() {
-	# upstream doesn't provide a pkgconfig file, so
-	# let's make one
-	printf 'prefix=/usr\nexec_prefix=${prefix}\nlibdir=%s\n' \
-			"/usr/$(get_libdir)" \
-		> ${PN}.pc
-	printf 'includedir=${prefix}/include\n\n' \
-		>> ${PN}.pc
-
-	printf 'Name: %s\nDescription: %s\nVersion: %s\nLibs: -lbpf %s\n' \
-			"${PN}" \
-			"${DESCRIPTION}" \
-			"${PV}" \
-			"$($(tc-getPKG_CONFIG) --libs libelf)" \
-		>> ${PN}.pc
-
-	default
-}
-
-src_compile() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		install
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}

diff --git a/dev-libs/libbpf/libbpf-0.20190404.ebuild b/dev-libs/libbpf/libbpf-0.20190404.ebuild
deleted file mode 100644
index e26002cb967..00000000000
--- a/dev-libs/libbpf/libbpf-0.20190404.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-EGIT_COMMIT="7c27c6306160f630c3c4f4b4971deb657126d681"
-
-HOMEPAGE="https://github.com/libbpf/libbpf"
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="static-libs"
-
-COMMON_DEPEND="virtual/libelf
-	!<=dev-util/bcc-0.7.0"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}/src"
-
-PATCHES=(
-	"${FILESDIR}/libbpf-0.20190404-makefile.patch"
-)
-
-src_prepare() {
-	# upstream doesn't provide a pkgconfig file, so
-	# let's make one
-	printf 'prefix=/usr\nexec_prefix=${prefix}\nlibdir=%s\n' \
-			"/usr/$(get_libdir)" \
-		> ${PN}.pc
-	printf 'includedir=${prefix}/include\n\n' \
-		>> ${PN}.pc
-
-	printf 'Name: %s\nDescription: %s\nVersion: %s\nLibs: -lbpf %s\n' \
-			"${PN}" \
-			"${DESCRIPTION}" \
-			"${PV}" \
-			"$($(tc-getPKG_CONFIG) --libs libelf)" \
-		>> ${PN}.pc
-
-	default
-}
-
-src_compile() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		install
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/, dev-libs/libbpf/files/
@ 2020-02-20 19:02 Patrick McLean
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2020-02-20 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     b3d6fe70779ee6b49176f8643d966a7009b808f2
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Feb 20 19:02:51 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 19:02:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d6fe70

dev-libs/libbpf: Remove old versions

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/libbpf/Manifest                       |  3 --
 dev-libs/libbpf/files/libbpf-0.0.3-paths.patch | 50 --------------------------
 dev-libs/libbpf/libbpf-0.0.3.ebuild            | 47 ------------------------
 dev-libs/libbpf/libbpf-0.0.4.ebuild            | 47 ------------------------
 dev-libs/libbpf/libbpf-0.0.5.ebuild            | 47 ------------------------
 5 files changed, 194 deletions(-)

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index e5d105fc3a0..17d66ead942 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,5 +1,2 @@
-DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad
-DIST libbpf-0.0.4.tar.gz 148625 BLAKE2B d8c2343441258a01ca54b0046b0f1d54cb2e0e7a09c99e489409b25d3f2486bc7d8a175b4a3e793b56ba72462d34b9a55c53e86eaf446c64f2c30d673e7f23bd SHA512 1e4a16ed0f3e378aa9d7080e4b54cb3a9542975105b09977d1ddecf3ae4dabb3b5edf80b92b61644b1f0cbda7ee7e135ee0f736e71c1d201a97b1b3dd573b543
-DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d

diff --git a/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
deleted file mode 100644
index 8f905819f65..00000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Makefile b/src/Makefile
-index 82a650c..549779d 100644
---- a/Makefile
-+++ b/src/Makefile
-@@ -36,7 +36,10 @@ OBJDIR ?= .
- OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
- 	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o)
- 
--LIBS := $(OBJDIR)/libbpf.a
-+ifdef BUILD_STATIC
-+	LIBS := $(OBJDIR)/libbpf.a
-+endif
-+
- ifndef BUILD_STATIC_ONLY
- 	LIBS += $(OBJDIR)/libbpf.so \
- 		$(OBJDIR)/libbpf.so.$(VERSION) \
-@@ -63,7 +66,7 @@ endif
- PREFIX ?= /usr
- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
- INCLUDEDIR ?= $(PREFIX)/include
--UAPIDIR ?= $(PREFIX)/include
-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi
- 
- all: $(LIBS) $(PC_FILE)
- 
-@@ -84,6 +87,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(OBJS)
- $(OBJDIR)/libbpf.pc:
- 	sed -e "s|@PREFIX@|$(PREFIX)|" \
- 		-e "s|@LIBDIR@|$(LIBDIR)|" \
-+		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
- 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
- 		< libbpf.pc.template > $@
- 
-diff --git a/libbpf.pc.template b/src/libbpf.pc.template
-index ac17fce..6d385d9 100644
---- a/libbpf.pc.template
-+++ b/src/libbpf.pc.template
-@@ -3,10 +3,11 @@
- prefix=@PREFIX@
- libdir=@LIBDIR@
- includedir=${prefix}/include
-+uapidir=@UAPIDIR@
- 
- Name: libbpf
- Description: BPF library
- Version: @VERSION@
- Libs: -L${libdir} -lbpf
- Requires.private: libelf
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${uapidir}

diff --git a/dev-libs/libbpf/libbpf-0.0.3.ebuild b/dev-libs/libbpf/libbpf-0.0.3.ebuild
deleted file mode 100644
index b455107a401..00000000000
--- a/dev-libs/libbpf/libbpf-0.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+static-libs"
-
-COMMON_DEPEND="virtual/libelf
-	!<=dev-util/bcc-0.7.0"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-PATCHES=(
-	"${FILESDIR}/libbpf-0.0.3-paths.patch"
-)
-
-src_compile() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		install install_uapi_headers
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}

diff --git a/dev-libs/libbpf/libbpf-0.0.4.ebuild b/dev-libs/libbpf/libbpf-0.0.4.ebuild
deleted file mode 100644
index b455107a401..00000000000
--- a/dev-libs/libbpf/libbpf-0.0.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+static-libs"
-
-COMMON_DEPEND="virtual/libelf
-	!<=dev-util/bcc-0.7.0"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-PATCHES=(
-	"${FILESDIR}/libbpf-0.0.3-paths.patch"
-)
-
-src_compile() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		install install_uapi_headers
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}

diff --git a/dev-libs/libbpf/libbpf-0.0.5.ebuild b/dev-libs/libbpf/libbpf-0.0.5.ebuild
deleted file mode 100644
index 7e265723db9..00000000000
--- a/dev-libs/libbpf/libbpf-0.0.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-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"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+static-libs"
-
-COMMON_DEPEND="virtual/libelf
-	!<=dev-util/bcc-0.7.0"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-PATCHES=(
-	"${FILESDIR}/libbpf-0.0.5-paths.patch"
-)
-
-src_compile() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		install install_uapi_headers
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/, dev-libs/libbpf/files/
@ 2020-02-20 19:02 Patrick McLean
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2020-02-20 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     757cf886fa28d35010bb3400670ca11ac6e6447a
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Feb 20 19:02:03 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 19:02:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=757cf886

dev-libs/libbpf-0.0.7: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/libbpf/Manifest                       |  1 +
 dev-libs/libbpf/files/libbpf-0.0.7-paths.patch | 38 +++++++++++++++++++++
 dev-libs/libbpf/libbpf-0.0.7.ebuild            | 47 ++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 8548bb3b47f..e5d105fc3a0 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -2,3 +2,4 @@ DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3b
 DIST libbpf-0.0.4.tar.gz 148625 BLAKE2B d8c2343441258a01ca54b0046b0f1d54cb2e0e7a09c99e489409b25d3f2486bc7d8a175b4a3e793b56ba72462d34b9a55c53e86eaf446c64f2c30d673e7f23bd SHA512 1e4a16ed0f3e378aa9d7080e4b54cb3a9542975105b09977d1ddecf3ae4dabb3b5edf80b92b61644b1f0cbda7ee7e135ee0f736e71c1d201a97b1b3dd573b543
 DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
+DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d

diff --git a/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
new file mode 100644
index 00000000000..cbc267b64a3
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index bc25aba..e1db3d6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@ endif
+ PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
+ INCLUDEDIR ?= $(PREFIX)/include
+-UAPIDIR ?= $(PREFIX)/include
++UAPIDIR ?= $(PREFIX)/include/bpf/uapi
+ 
+ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
+ 
+@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
+ $(OBJDIR)/libbpf.pc:
+ 	sed -e "s|@PREFIX@|$(PREFIX)|" \
+ 		-e "s|@LIBDIR@|$(LIBDIR)|" \
++		-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 @@
+ prefix=@PREFIX@
+ libdir=@LIBDIR@
+ includedir=${prefix}/include
++uapidir=@UAPIDIR@
+ 
+ Name: libbpf
+ Description: BPF library
+ Version: @VERSION@
+ Libs: -L${libdir} -lbpf
+ Requires.private: libelf zlib
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${uapidir}

diff --git a/dev-libs/libbpf/libbpf-0.0.7.ebuild b/dev-libs/libbpf/libbpf-0.0.7.ebuild
new file mode 100644
index 00000000000..6ba1ae96c61
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.0.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+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"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.0.7-paths.patch"
+)
+
+src_compile() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/, dev-libs/libbpf/files/
@ 2020-04-03 17:22 Patrick McLean
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2020-04-03 17:22 UTC (permalink / raw
  To: gentoo-commits

commit:     d8e0412b28f4b7cc54b11809a5528e6d9c8e69a8
Author:     Josip Kelecic <josip.kelecic <AT> sartura <DOT> hr>
AuthorDate: Thu Apr  2 08:50:22 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 17:21:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e0412b

dev-libs/libbpf: add live ebuild

Signed-off-by: Josip Kelecic <josip.kelecic <AT> sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/15207
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
Closes: https://bugs.gentoo.org/711496
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/libbpf/files/libbpf-9999-paths.patch | 38 ++++++++++++++++++++
 dev-libs/libbpf/libbpf-9999.ebuild            | 52 +++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/dev-libs/libbpf/files/libbpf-9999-paths.patch b/dev-libs/libbpf/files/libbpf-9999-paths.patch
new file mode 100644
index 00000000000..cbc267b64a3
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-9999-paths.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index bc25aba..e1db3d6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@ endif
+ PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
+ INCLUDEDIR ?= $(PREFIX)/include
+-UAPIDIR ?= $(PREFIX)/include
++UAPIDIR ?= $(PREFIX)/include/bpf/uapi
+ 
+ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
+ 
+@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
+ $(OBJDIR)/libbpf.pc:
+ 	sed -e "s|@PREFIX@|$(PREFIX)|" \
+ 		-e "s|@LIBDIR@|$(LIBDIR)|" \
++		-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 @@
+ prefix=@PREFIX@
+ libdir=@LIBDIR@
+ includedir=${prefix}/include
++uapidir=@UAPIDIR@
+ 
+ Name: libbpf
+ Description: BPF library
+ Version: @VERSION@
+ Libs: -L${libdir} -lbpf
+ Requires.private: libelf zlib
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${uapidir}

diff --git a/dev-libs/libbpf/libbpf-9999.ebuild b/dev-libs/libbpf/libbpf-9999.ebuild
new file mode 100644
index 00000000000..08e5746d4bf
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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
+
+HOMEPAGE="https://www.kernel.org/doc/html/latest/bpf/bpf_devel_QA.html"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-9999-paths.patch"
+)
+
+src_compile() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/, dev-libs/libbpf/files/
@ 2021-01-04 21:36 Patrick McLean
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2021-01-04 21:36 UTC (permalink / raw
  To: gentoo-commits

commit:     a300e08630dbb4e81d9cdaf4f8ded90d693ffb02
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Mon Jan  4 21:32:57 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=a300e086

dev-libs/libbpf-0.3: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/libbpf/Manifest                       |  1 +
 dev-libs/libbpf/files/libbpf-0.3.0-paths.patch | 34 ++++++++++++++++
 dev-libs/libbpf/libbpf-0.3.ebuild              | 55 ++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)

diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index fbde9fd1377..af3a412b5cd 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -5,3 +5,4 @@ DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d
 DIST libbpf-0.1.0.tar.gz 666896 BLAKE2B 5923b4c8fb915722f8cc2015ab8f07773a83c4252a59aef784983e46db7cd784e8ff5cc2284d3f5ded6bb92957f8d73b367a35fa1b5693e0cacaaef414a2f410 SHA512 3a5d823e4751408fd9e3bafe0be0a6a78de7dea0114bbd1166d8b3887938eef4e355ba6221b4bded9fc8a8280edede606c8c8078fd40aebdeaebbbb38f4221fe
 DIST libbpf-0.1.1.tar.gz 666908 BLAKE2B 0efb044b1dc02230d14a6e92c40d66f7cb28c7efbecc3d97d084a52dde581dbd02b02fb7fbbe8b4ca051f2f64497c6240c5dd9c992e6fe4629a1332311b7833c SHA512 b9f68323a8f53b0fb0bf418b8a37685e7d74b6f5ad7aa2f266f65cd57199b3b9b5865bc4579758e5adcfbb027ced83e12ee87f3ff3bf159c7b54cbdcd50fd62f
 DIST libbpf-0.2.tar.gz 699136 BLAKE2B d3c7005e5c27f805a33b444267ee28c3fb143c809a8a3ac733d51c56e7ee310e089964844cd4f1f7519b20dea1f4e4d6b0e6acd7bbdd173c99af54fad3635771 SHA512 22fed87cd4da1765465d812979b39ee3126b444fd6b460472a0a7e2f4fb496d278c9d7d672c3fb15005a58d361fd87c5173c18dcf55664dfbb8e6cadb2eed33a
+DIST libbpf-0.3.tar.gz 979131 BLAKE2B 523040600cb08ed1ad301899f85fd7af8bc498ff8d1fd41783aeab223feb795d074072aba048d7e38af045bb3fbfe478bb2cb0ac34f4c22e4dea4ac5f0d34a4c SHA512 91c3368626e731b5868fd1bb6d16bd049b2ed0d5cbf966647fa1069cf8c912d91f3d734f05353a0c16c8ff03790ca8e1e6515fff66e4a76d70ffdf2dbac6d8e3

diff --git a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch
new file mode 100644
index 00000000000..ff087bb3871
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch
@@ -0,0 +1,34 @@
+--- a/Makefile
++++ b/Makefile
+@@ -76,7 +76,7 @@ endif
+ PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
+ INCLUDEDIR ?= $(PREFIX)/include
+-UAPIDIR ?= $(PREFIX)/include
++UAPIDIR ?= $(PREFIX)/include/bpf/uapi
+ 
+ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
+ 
+@@ -101,6 +101,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
+ $(OBJDIR)/libbpf.pc:
+ 	$(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \
+ 		-e "s|@LIBDIR@|$(LIBDIR_PC)|" \
++		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
+ 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
+ 		< libbpf.pc.template > $@
+ 
+--- a/libbpf.pc.template
++++ b/libbpf.pc.template
+@@ -3,10 +3,11 @@
+ prefix=@PREFIX@
+ libdir=@LIBDIR@
+ includedir=${prefix}/include
++uapidir=@UAPIDIR@
+ 
+ Name: libbpf
+ Description: BPF library
+ Version: @VERSION@
+ Libs: -L${libdir} -lbpf
+ Requires.private: libelf zlib
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${uapidir}

diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
new file mode 100644
index 00000000000..b74596abd7b
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.3.0-paths.patch"
+)
+
+src_compile() {
+	append-cflags -fPIC
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		V=1
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/, dev-libs/libbpf/files/
@ 2021-09-21  0:37 Patrick McLean
  0 siblings, 0 replies; 7+ messages in thread
From: Patrick McLean @ 2021-09-21  0:37 UTC (permalink / raw
  To: gentoo-commits

commit:     64afd4ca22ff377ab29abfcd265e4ea9b4ca6e2a
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 19:23:24 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 00:37:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64afd4ca

dev-libs/libbpf: Remove old patches

- Update 0.3 and 0.4 versions to use 9999 patch since it's the same
  as 0.3 patch

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22298
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/libbpf/files/libbpf-0.0.5-paths.patch     | 38 -----------------
 dev-libs/libbpf/files/libbpf-0.0.7-paths.patch     | 38 -----------------
 .../files/libbpf-0.0.9-fix-hashmap-on-lp32.patch   | 49 ----------------------
 dev-libs/libbpf/files/libbpf-0.3.0-paths.patch     | 34 ---------------
 dev-libs/libbpf/libbpf-0.3.ebuild                  |  2 +-
 dev-libs/libbpf/libbpf-0.4.0.ebuild                |  2 +-
 6 files changed, 2 insertions(+), 161 deletions(-)

diff --git a/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch
deleted file mode 100644
index e9eda9c2dce..00000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 6992fbf..cefc77a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -64,7 +64,7 @@ endif
- PREFIX ?= /usr
- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
- INCLUDEDIR ?= $(PREFIX)/include
--UAPIDIR ?= $(PREFIX)/include
-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi
- 
- all: $(STATIC_LIBS) $(SHARED_LIBS) $(PC_FILE)
- 
-@@ -85,6 +85,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
- $(OBJDIR)/libbpf.pc:
- 	sed -e "s|@PREFIX@|$(PREFIX)|" \
- 		-e "s|@LIBDIR@|$(LIBDIR)|" \
-+		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
- 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
- 		< libbpf.pc.template > $@
- 
-diff --git a/libbpf.pc.template b/libbpf.pc.template
-index ac17fce..6d385d9 100644
---- a/libbpf.pc.template
-+++ b/libbpf.pc.template
-@@ -3,10 +3,11 @@
- prefix=@PREFIX@
- libdir=@LIBDIR@
- includedir=${prefix}/include
-+uapidir=@UAPIDIR@
- 
- Name: libbpf
- Description: BPF library
- Version: @VERSION@
- Libs: -L${libdir} -lbpf
- Requires.private: libelf
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${uapidir}

diff --git a/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
deleted file mode 100644
index cbc267b64a3..00000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bc25aba..e1db3d6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -66,7 +66,7 @@ endif
- PREFIX ?= /usr
- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
- INCLUDEDIR ?= $(PREFIX)/include
--UAPIDIR ?= $(PREFIX)/include
-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi
- 
- TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
- 
-@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
- $(OBJDIR)/libbpf.pc:
- 	sed -e "s|@PREFIX@|$(PREFIX)|" \
- 		-e "s|@LIBDIR@|$(LIBDIR)|" \
-+		-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 @@
- prefix=@PREFIX@
- libdir=@LIBDIR@
- includedir=${prefix}/include
-+uapidir=@UAPIDIR@
- 
- Name: libbpf
- Description: BPF library
- Version: @VERSION@
- Libs: -L${libdir} -lbpf
- Requires.private: libelf zlib
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${uapidir}

diff --git a/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch b/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch
deleted file mode 100644
index 98baf1cd605..00000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.9-fix-hashmap-on-lp32.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cd016d93f7bf280fe6f2dfc723257786dd3ffd00 Mon Sep 17 00:00:00 2001
-From: Jakub Bogusz <qboosh@pld-linux.org>
-Date: Thu, 9 Jul 2020 15:57:23 -0700
-Subject: [PATCH] libbpf: Fix libbpf hashmap on (I)LP32 architectures
-
-On ILP32, 64-bit result was shifted by value calculated for 32-bit long type
-and returned value was much outside hashmap capacity.
-As advised by Andrii Nakryiko, this patch uses different hashing variant for
-architectures with size_t shorter than long long.
-
-Fixes: e3b924224028 ("libbpf: add resizable non-thread safe internal hashmap")
-Signed-off-by: Jakub Bogusz <qboosh@pld-linux.org>
-Signed-off-by: Andrii Nakryiko <andriin@fb.com>
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Link: https://lore.kernel.org/bpf/20200709225723.1069937-1-andriin@fb.com
----
- hashmap.h | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/hashmap.h b/hashmap.h
-index df59fd4..e0af36b 100644
---- a/hashmap.h
-+++ b/hashmap.h
-@@ -11,14 +11,18 @@
- #include <stdbool.h>
- #include <stddef.h>
- #include <limits.h>
--#ifndef __WORDSIZE
--#define __WORDSIZE (__SIZEOF_LONG__ * 8)
--#endif
- 
- static inline size_t hash_bits(size_t h, int bits)
- {
- 	/* shuffle bits and return requested number of upper bits */
--	return (h * 11400714819323198485llu) >> (__WORDSIZE - bits);
-+#if (__SIZEOF_SIZE_T__ == __SIZEOF_LONG_LONG__)
-+	/* LP64 case */
-+	return (h * 11400714819323198485llu) >> (__SIZEOF_LONG_LONG__ * 8 - bits);
-+#elif (__SIZEOF_SIZE_T__ <= __SIZEOF_LONG__)
-+	return (h * 2654435769lu) >> (__SIZEOF_LONG__ * 8 - bits);
-+#else
-+#	error "Unsupported size_t size"
-+#endif
- }
- 
- typedef size_t (*hashmap_hash_fn)(const void *key, void *ctx);
--- 
-2.26.2
-

diff --git a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch b/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch
deleted file mode 100644
index ff087bb3871..00000000000
--- a/dev-libs/libbpf/files/libbpf-0.3.0-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -76,7 +76,7 @@ endif
- PREFIX ?= /usr
- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
- INCLUDEDIR ?= $(PREFIX)/include
--UAPIDIR ?= $(PREFIX)/include
-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi
- 
- TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
- 
-@@ -101,6 +101,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
- $(OBJDIR)/libbpf.pc:
- 	$(Q)sed -e "s|@PREFIX@|$(PREFIX)|" \
- 		-e "s|@LIBDIR@|$(LIBDIR_PC)|" \
-+		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
- 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
- 		< libbpf.pc.template > $@
- 
---- a/libbpf.pc.template
-+++ b/libbpf.pc.template
-@@ -3,10 +3,11 @@
- prefix=@PREFIX@
- libdir=@LIBDIR@
- includedir=${prefix}/include
-+uapidir=@UAPIDIR@
- 
- Name: libbpf
- Description: BPF library
- Version: @VERSION@
- Libs: -L${libdir} -lbpf
- Requires.private: libelf zlib
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${uapidir}

diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
index f80ac671a49..754ab610158 100644
--- a/dev-libs/libbpf/libbpf-0.3.ebuild
+++ b/dev-libs/libbpf/libbpf-0.3.ebuild
@@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/libbpf-0.3.0-paths.patch"
+	"${FILESDIR}/libbpf-9999-paths.patch"
 )
 
 src_compile() {

diff --git a/dev-libs/libbpf/libbpf-0.4.0.ebuild b/dev-libs/libbpf/libbpf-0.4.0.ebuild
index 0ef44fea268..438a4a1415e 100644
--- a/dev-libs/libbpf/libbpf-0.4.0.ebuild
+++ b/dev-libs/libbpf/libbpf-0.4.0.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/libbpf-0.3.0-paths.patch"
+	"${FILESDIR}/libbpf-9999-paths.patch"
 )
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-09-21  0:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-20 19:02 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libbpf/, dev-libs/libbpf/files/ Patrick McLean
  -- strict thread matches above, loose matches on Subject: below --
2021-09-21  0:37 Patrick McLean
2021-01-04 21:36 Patrick McLean
2020-04-03 17:22 Patrick McLean
2020-02-20 19:02 Patrick McLean
2019-06-14 21:03 Patrick McLean
2019-04-04 22:27 Patrick McLean

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox