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 3279D15800F for ; Tue, 31 Jan 2023 23:06:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6546CE0AE4; Tue, 31 Jan 2023 23:06:21 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49E74E0AE4 for ; Tue, 31 Jan 2023 23:06:21 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 33FF3335D63 for ; Tue, 31 Jan 2023 23:06:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7007895 for ; Tue, 31 Jan 2023 23:06:17 +0000 (UTC) From: "Patrick McLean" 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" Message-ID: <1675206374.1b42c42ef2e65c53dca291a3ca0619690adb5d78.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/files/, sys-apps/nvme-cli/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/nvme-cli/Manifest sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild sys-apps/nvme-cli/nvme-cli-2.3.ebuild X-VCS-Directories: sys-apps/nvme-cli/ sys-apps/nvme-cli/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 1b42c42ef2e65c53dca291a3ca0619690adb5d78 X-VCS-Branch: master Date: Tue, 31 Jan 2023 23:06:17 +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: a274c008-24bc-498b-8b40-1c07049ff123 X-Archives-Hash: cc160ddeda2de97bd1f7c55249ca482a commit: 1b42c42ef2e65c53dca291a3ca0619690adb5d78 Author: Patrick McLean gentoo org> AuthorDate: Tue Jan 31 23:05:47 2023 +0000 Commit: Patrick McLean gentoo org> CommitDate: Tue Jan 31 23:06:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b42c42e sys-apps/nvme-cli: Add 2.3, update libnvme json USE dep Signed-off-by: Patrick McLean gentoo.org> sys-apps/nvme-cli/Manifest | 1 + .../nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch | 25 ++++++++++++++++++++++ sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild | 4 ++-- .../{nvme-cli-2.2.1.ebuild => nvme-cli-2.3.ebuild} | 12 ++++++----- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index edd4c759e100..f7b97d36e74c 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1 +1,2 @@ DIST nvme-cli-2.2.1.gh.tar.gz 706199 BLAKE2B e0026fc2ee3edeffa18b0fc8365703e3de6f69cdd665878e8589fefa334ddb78f3fdf2768bd5a141dc27b0a7403d0fd7472db763e7e41b55a3cac314105faac3 SHA512 8efa94d49a4d443cdb0310386733e88117f17719b05044f11e63e2a09143fce55918171b457a467371263ebb2e36552558aad249ae4dbd27941af79fe9722e26 +DIST nvme-cli-2.3.gh.tar.gz 733161 BLAKE2B b6da650379f24e0dc5c41af3d09fe15076ed70ad39cf48060fd949e3a4bbfe896eef4dd42e27314fab695710c9cb04985f3444e0384b71794cfbf489aa3e6244 SHA512 9ef654e782ba737d3858fb11f24caf27aea820480179d07d32599731be204e52693062cdb86786ab5cdd1d94fe32ae9028baa0a58693d2eaee5a2b71155e3db2 diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch b/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch new file mode 100644 index 000000000000..e8bba22a92bb --- /dev/null +++ b/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch @@ -0,0 +1,25 @@ +diff --git a/meson.build b/meson.build +index c05dc47f..4ae7c513 100644 +--- a/meson.build ++++ b/meson.build +@@ -64,9 +64,9 @@ libz_dep = dependency('zlib', required: true, + fallback : ['zlib', 'zlib_dep']) + + # Check for libhugetlbfs availability (optional) +-if cc.has_header('hugetlbfs.h') ++if get_option('hugepages') and cc.has_header('hugetlbfs.h') + libhugetlbfs_dep = cc.find_library('hugetlbfs', +- required : false) ++ required : true) + have_libhugetlbfs = libhugetlbfs_dep.found() + else + libhugetlbfs_dep = [] +diff --git a/meson_options.txt b/meson_options.txt +index 04843ea5..bb10b6c0 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -9,3 +9,4 @@ option('nvme-tests', type : 'boolean', value : false, description: 'Run tests ag + option('docs', type : 'combo', choices : ['false', 'html', 'man', 'all'], description : 'install documentation') + option('docs-build', type : 'boolean', value : false, description : 'build documentation') + option('pdc-enabled', type: 'boolean', value : false, description : 'set default Persistent Discovery Controllers behavior') ++option('hugepages', type: 'boolean', value : false, description : 'Enable support for hugetlbfs') diff --git a/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild index e048b5dc9043..2c1223bc049e 100644 --- a/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild +++ b/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86" IUSE="hugepages +json" RDEPEND=" - >=sys-libs/libnvme-1.2:=[json=] + >=sys-libs/libnvme-1.2:=[json(+)=] hugepages? ( sys-libs/libhugetlbfs:= ) json? ( dev-libs/json-c:= ) sys-libs/zlib:= diff --git a/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.3.ebuild similarity index 77% copy from sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild copy to sys-apps/nvme-cli/nvme-cli-2.3.ebuild index e048b5dc9043..fd549dd99719 100644 --- a/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild +++ b/sys-apps/nvme-cli/nvme-cli-2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,13 +11,13 @@ SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh LICENSE="GPL-2 GPL-2+" SLOT="0" -KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86" -IUSE="hugepages +json" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="hugepages" RDEPEND=" - >=sys-libs/libnvme-1.2:=[json=] + >=sys-libs/libnvme-1.3:= hugepages? ( sys-libs/libhugetlbfs:= ) - json? ( dev-libs/json-c:= ) + dev-libs/json-c:= sys-libs/zlib:= " @@ -30,6 +30,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/nvme-cli-2.2-docdir.patch" + "${FILESDIR}/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch" ) src_configure() { @@ -39,6 +40,7 @@ src_configure() { -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" -Dsystemddir="${unitdir%/system}" -Dudevrulesdir="${EPREFIX}$(get_udevdir)" + $(meson_use hugepages) ) meson_src_configure }