Skip to contentSkip to conversation

package/apcupsd: always depend on threads

PATCH New James Hilliard 2 participants 2 messages Apr 22, 2020 – Apr 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/apcupsd: always depend on threads

Fixes:
http://autobuild.buildroot.net/results/aa2ad7bdb37da611a4ec863ed2e986f34ea5228b/build-end.log

---
 package/apcupsd/Config.in | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
package/apcupsd/Config.in +3 -10
index 2849736a1a..e3fcc1e014 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_APCUPSD
 	bool "apcupsd"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	help
 	  A daemon for controlling APC UPSes.
@@ -26,16 +27,12 @@ config BR2_PACKAGE_APCUPSD_MODBUS
 
 config BR2_PACKAGE_APCUPSD_MODBUS_USB
 	bool "modbus usb"
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	select BR2_PACKAGE_APCUPSD_MODBUS
 	help
 	  Compile MODBUS/USB driver code
 
-comment "modbus usb support needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
 config BR2_PACKAGE_APCUPSD_NET
 	bool "net"
 	help
@@ -53,17 +50,13 @@ config BR2_PACKAGE_APCUPSD_SNMP
 
 config BR2_PACKAGE_APCUPSD_USB
 	bool "usb"
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
 	  Compile USB UPS code
 
-comment "usb support needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
 endif
 
-comment "apcupsd needs a toolchain w/ C++"
+comment "apcupsd needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/apcupsd: always depend on threads

Quoted 4 lines · On Wed, 22 Apr 2020 00:49:42 -0600 James Hilliard <[email protected]>…

Fixes:
http://autobuild.buildroot.net/results/aa2ad7bdb37da611a4ec863ed2e986f34ea5228b/build-end.log

I've applied, but I've kept the thread dependencies on the USB related options. Even though, they are redundant, we like to keep them to be fully consistent in how we propagate "depends on".

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com