From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1CEAC158041 for ; Thu, 7 Mar 2024 11:34:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22947E2A0B; Thu, 7 Mar 2024 11:34:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05317E2A0A for ; Thu, 7 Mar 2024 11:34:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEF4C343026 for ; Thu, 7 Mar 2024 11:34:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36B8014F6 for ; Thu, 7 Mar 2024 11:34:26 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1709784374.af85370459af3a4b5244cf8e6642ed7773afc94d.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-admin/ananicy-cpp/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r2.ebuild app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild app-admin/ananicy-cpp/metadata.xml X-VCS-Directories: app-admin/ananicy-cpp/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: af85370459af3a4b5244cf8e6642ed7773afc94d X-VCS-Branch: master Date: Thu, 7 Mar 2024 11:34:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5049a4aa-7a36-4853-aa90-1554ea2638f7 X-Archives-Hash: e07bda9e0cd1d69ce0bd809427ecbbd6 commit: af85370459af3a4b5244cf8e6642ed7773afc94d Author: Alberto Gireud protonmail com> AuthorDate: Thu Mar 7 03:49:13 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Mar 7 04:06:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=af853704 app-admin/ananicy-cpp: Add support for Clang compilation and eBPF implementation Signed-off-by: Alberto Gireud protonmail.com> ...1.1.1-r2.ebuild => ananicy-cpp-1.1.1-r3.ebuild} | 39 ++++++++++++++++++++-- app-admin/ananicy-cpp/metadata.xml | 4 +++ 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r2.ebuild b/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild similarity index 55% rename from app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r2.ebuild rename to app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild index e97720ff94..abefa9baaf 100644 --- a/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r2.ebuild +++ b/app-admin/ananicy-cpp/ananicy-cpp-1.1.1-r3.ebuild @@ -10,32 +10,65 @@ HOMEPAGE="https://gitlab.com/ananicy-cpp/ananicy-cpp" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="systemd" +IUSE="bpf clang systemd" +REQUIRED_USE=" + bpf? ( clang ) +" SRC_URI="https://gitlab.com/ananicy-cpp/ananicy-cpp/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" S="${WORKDIR}/${PN}-v${PV}" -DEPEND=" +RDEPEND=" !app-admin/ananicy >=dev-cpp/nlohmann_json-3.9 >=dev-libs/libfmt-8 >=dev-libs/spdlog-1.9 + bpf? ( + dev-libs/elfutils + dev-libs/libbpf + dev-util/bpftool + ) systemd? ( sys-apps/systemd ) " -RDEPEND="${DEPEND}" + +DEPEND=" + >=dev-build/cmake-3.17 + clang? ( >=sys-devel/clang-10 ) + ${RDEPEND} +" PATCHES=( "${FILESDIR}/${P}-remove-debug-flags.patch" ) +pkg_setup() { + if use bpf ; then + CONFIG_CHECK+="~BPF ~BPF_EVENTS ~BPF_SYSCALL ~HAVE_EBPF_JIT" + fi +} + src_configure() { local mycmakeargs=( -DENABLE_SYSTEMD=$(usex systemd) + -DUSE_BPF_PROC_IMPL=$(usex bpf) -DUSE_EXTERNAL_FMTLIB=ON -DUSE_EXTERNAL_JSON=ON -DUSE_EXTERNAL_SPDLOG=ON -DVERSION=${PV} ) + + if use clang; then + local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }') + [[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}") + [[ -z ${version_clang} ]] && die "Failed to read clang version!" + CC=${CHOST}-clang-${version_clang} + CXX=${CHOST}-clang++-${version_clang} + + if use bpf ; then + mycmakeargs+=( -DBPF_BUILD_LIBBPF=OFF ) + fi + fi + cmake_src_configure } diff --git a/app-admin/ananicy-cpp/metadata.xml b/app-admin/ananicy-cpp/metadata.xml index 52724a1795..59b0456acf 100644 --- a/app-admin/ananicy-cpp/metadata.xml +++ b/app-admin/ananicy-cpp/metadata.xml @@ -10,4 +10,8 @@ ananicy-cpp/ananicy-cpp kuche1/minq-ananicy + + Use eBPF for processing + Use Clang compiler instead of GCC +