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 21FAE15817D for ; Wed, 12 Jun 2024 02:01:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE35CE2A7D; Wed, 12 Jun 2024 02:01:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C8BBCE2A7D for ; Wed, 12 Jun 2024 02:01:16 +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 00E48335DCC for ; Wed, 12 Jun 2024 02:01:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D9DB1C97 for ; Wed, 12 Jun 2024 02:01:14 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1718157619.f613fb6ac78a86b44272cbd40a791c714a98d7bb.sam@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/files/nvme-cli-2.9.1-musl.patch sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild X-VCS-Directories: sys-apps/nvme-cli/files/ sys-apps/nvme-cli/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f613fb6ac78a86b44272cbd40a791c714a98d7bb X-VCS-Branch: master Date: Wed, 12 Jun 2024 02:01:14 +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: 8fbceca6-99dd-46bb-8637-79c7daa1af0d X-Archives-Hash: e2427bf4a8b26e103b34b6c93373c15a commit: f613fb6ac78a86b44272cbd40a791c714a98d7bb Author: Sam James gentoo org> AuthorDate: Wed Jun 12 02:00:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 12 02:00:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f613fb6a sys-apps/nvme-cli: fix musl build Closes: https://bugs.gentoo.org/934081 Signed-off-by: Sam James gentoo.org> sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch | 28 +++++++++++++++++++++++ sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild | 1 + 2 files changed, 29 insertions(+) diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch b/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch new file mode 100644 index 000000000000..de7b488cc25d --- /dev/null +++ b/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/934081 +https://github.com/linux-nvme/nvme-cli/commit/650070ad5d4a97fc87f9018743e3b566deba36c8 + +From 650070ad5d4a97fc87f9018743e3b566deba36c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 21 May 2024 14:09:32 -0700 +Subject: [PATCH] plugins/ssstc: Replace __uint16_t with uint16_t + +uint16_t is ISO defined and comes from stdint.h, makes it +portable across glibc and musl on linux. + +Signed-off-by: Khem Raj +--- a/plugins/ssstc/ssstc-nvme.c ++++ b/plugins/ssstc/ssstc-nvme.c +@@ -64,9 +64,9 @@ void show_ssstc_add_smart_log_jsn(struct nvme_additional_smart_log *smart, + unsigned int nsid, const char *devname) + { + struct json_object *root, *entry_stats, *dev_stats, *multi; +- __uint16_t wear_level_min = 0; +- __uint16_t wear_level_max = 0; +- __uint16_t wear_level_avg = 0; ++ uint16_t wear_level_min = 0; ++ uint16_t wear_level_max = 0; ++ uint16_t wear_level_avg = 0; + uint64_t raw_val = 0; + + root = json_create_object(); + diff --git a/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild index ead3edbdb1f6..991abb4ea462 100644 --- a/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild +++ b/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild @@ -29,6 +29,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.9.1-musl-stdint.patch + "${FILESDIR}"/${PN}-2.9.1-musl.patch ) src_configure() {