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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 247CB15817D for ; Sat, 8 Jun 2024 17:27:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 459852BC013; Sat, 8 Jun 2024 17:27:33 +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 1B24C2BC013 for ; Sat, 8 Jun 2024 17:27:33 +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 1F6F1340815 for ; Sat, 8 Jun 2024 17:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C1E51610 for ; Sat, 8 Jun 2024 17:27:30 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1717867559.7702b49add12ca5b5f6508bc5416f2a780ade761.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild X-VCS-Directories: sys-apps/systemd-utils/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 7702b49add12ca5b5f6508bc5416f2a780ade761 X-VCS-Branch: master Date: Sat, 8 Jun 2024 17:27:30 +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: 9c139ec0-eec6-4955-b5ff-4338d42209ed X-Archives-Hash: 849cb76ec611e6e994980444149fff65 commit: 7702b49add12ca5b5f6508bc5416f2a780ade761 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jun 8 17:25:59 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jun 8 17:25:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7702b49a sys-apps/systemd-utils: fix build on arches without DMI At least according to systemd upstream. Closes: https://bugs.gentoo.org/933834 Signed-off-by: Mike Gilbert gentoo.org> .../systemd-utils/systemd-utils-255.7-r1.ebuild | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild index 48965c8945a6..ce13e54935e2 100644 --- a/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild @@ -254,6 +254,15 @@ multilib_src_configure() { fi } +have_dmi() { + # see dmi_arches in meson.build + case ${CHOST} in + aarch64*|arm*|ia64*|i?86*|loongarch64*|mips*|x86_64*) + return 0 ;; + esac + return 1 +} + multilib_src_compile() { local targets=() optional_targets=() if multilib_is_native_abi; then @@ -327,7 +336,6 @@ multilib_src_compile() { systemd-hwdb ata_id cdrom_id - dmi_memory_id fido_id iocost mtd_probe @@ -360,6 +368,9 @@ multilib_src_compile() { # Needed for tests rules.d/99-systemd.rules ) + if have_dmi; then + targets+=( dmi_memory_id ) + fi if use test; then targets+=( test-fido-id-desc @@ -475,8 +486,13 @@ multilib_src_install() { dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd exeinto /usr/lib/udev - set_rpath {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id} - doexe {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id} + set_rpath {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id} + doexe {ata_id,cdrom_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id} + + if have_dmi; then + set_rpath dmi_memory_id + doexe dmi_memory_id + fi rm -f rules.d/99-systemd.rules insinto /usr/lib/udev/rules.d