commit: 303a746c9ffce9f5940f48ffef8f1cd30ae968ee Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jun 27 09:14:55 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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} )
