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 5D1BD158094 for ; Mon, 27 Jun 2022 09:29:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A6C1E0A9E; Mon, 27 Jun 2022 09:29:03 +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 1A7CBE0A9E for ; Mon, 27 Jun 2022 09:29:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E1DC0341435 for ; Mon, 27 Jun 2022 09:29:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86383518 for ; Mon, 27 Jun 2022 09:29:00 +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: <1656322024.303a746c9ffce9f5940f48ffef8f1cd30ae968ee.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/lm-sensors/files/, sys-apps/lm-sensors/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild X-VCS-Directories: sys-apps/lm-sensors/files/ sys-apps/lm-sensors/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 303a746c9ffce9f5940f48ffef8f1cd30ae968ee X-VCS-Branch: master Date: Mon, 27 Jun 2022 09:29:00 +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: 5c244020-a5a9-489f-a87e-5251eb1c3bf8 X-Archives-Hash: 19725e34c414e3e09cf9226e5e9f5afd commit: 303a746c9ffce9f5940f48ffef8f1cd30ae968ee Author: Sam James gentoo org> AuthorDate: Mon Jun 27 09:14:55 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 27 09:27:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303a746c sys-apps/lm-sensors: fix build w/o sys-apps/which Signed-off-by: Sam James gentoo.org> .../files/lm-sensors-3.6.0-no-which.patch | 21 +++++++++++++++++++++ sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch new file mode 100644 index 000000000000..e75e23142d86 --- /dev/null +++ b/sys-apps/lm-sensors/files/lm-sensors-3.6.0-no-which.patch @@ -0,0 +1,21 @@ +https://github.com/lm-sensors/lm-sensors/pull/402 +--- a/Makefile ++++ b/Makefile +@@ -250,7 +250,7 @@ manhtml: + + # Flex and Bison + %.c: %.y +- @if ! which $(BISON) 2> /dev/null ; then \ ++ @if ! command -v $(BISON) 2> /dev/null ; then \ + echo "Please install $(BISON), then run \"make clean\" and try again" ; \ + false ; \ + fi +@@ -263,7 +263,7 @@ FLEX_FLAGS := -Psensors_yy -t -Cfe -8 + endif + + %.c: %.l +- @if ! which $(FLEX) 2> /dev/null ; then \ ++ @if ! command -v $(FLEX) 2> /dev/null ; then \ + echo "Please install $(FLEX), then run \"make clean\" and try again" ; \ + false ; \ + fi diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild index 74b209916ec0..01d6dec1eb38 100644 --- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild +++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild @@ -44,7 +44,10 @@ WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use." WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled." WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors." -PATCHES=( "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch + "${FILESDIR}"/${PN}-3.6.0-no-which.patch +) DOCS=( CHANGES CONTRIBUTORS INSTALL README ) DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )