htop: Add HTOP_LMSENSORS config option

Enabled by default for x86, this enables lm-sensors support in htop.
Also add --enable-linux-affinity to avoid autodetecting it

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 37ca4e923d2efe21a4c6c8d8d9ab8b6720a4cd3a)

diff --git a/admin/htop/Makefile b/admin/htop/Makefile
index 165d7120d57bb1bdf3792f7d93fef7c3ded32da0..b1041f72d15124286fd19ea1e7c8e0cb1eacf161 100644 (file)
--- a/admin/htop/Makefile
+++ b/admin/htop/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=htop
 PKG_VERSION:=3.0.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/htop-dev/htop/tar.gz/$(PKG_VERSION)?
@@ -24,6 +24,9 @@ PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
+PKG_CONFIG_DEPENDS:= CONFIG_HTOP_LMSENSORS
+PKG_BUILD_DEPENDS:= HTOP_LMSENSORS:lm-sensors
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/htop
@@ -41,7 +44,20 @@ define Package/htop/description
  see all processes and their full command lines.
 endef
 
+define Package/htop/config
+       config HTOP_LMSENSORS
+               bool "Compile Htop with lm-sensors support"
+               depends on PACKAGE_htop
+               default y if TARGET_x86
+               help
+                       Build htop with lm-sensors support.
+                       This doesn't add lm-sensors as dependency,
+                       if present it'll loaded using dlopen().
+endef
+
 CONFIGURE_ARGS += \
+       --with-sensors=$(if $(CONFIG_HTOP_LMSENSORS),yes,no) \
+       --enable-linux-affinity \
        --disable-unicode \
        --disable-hwloc