Skip to contentSkip to conversation

package/{collectd, domoticz}: fix outdated dependencies for mosquitto

PATCH New Titouan Christophe 2 participants 3 messages Aug 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/{collectd, domoticz}: fix outdated dependencies for mosquitto

In 4fc62e1eb6b3adbfc3d3eb7f841275ae8cd1b424, we removed arch/toolchain dependencies from the mosquitto library (MMU, !STATIC, SYNC4), and moved them to the mosquitto broker only.

All the packages modified here only need the mosquitto library, so they shouldn't have those depends anymore; but this was never done before.

---
 package/collectd/Config.in | 1 -
 package/domoticz/Config.in | 3 ---
 2 files changed, 4 deletions(-)
package/collectd/Config.in +0 -1
index 4f54944cbc..ddf64015bd 100644
@@ -607,7 +607,6 @@ comment "grpc needs a toolchain w/ C++, gcc >= 4.8"
 
 config BR2_PACKAGE_COLLECTD_MQTT
 	bool "mqtt"
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
 	select BR2_PACKAGE_MOSQUITTO
 	help
 	  Sends metrics to and/or receives metrics from an MQTT broker.
package/domoticz/Config.in +0 -3
index c713ac58b1..a2ad9f1b07 100644
@@ -1,8 +1,5 @@
 config BR2_PACKAGE_DOMOTICZ
 	bool "domoticz"
-	depends on BR2_USE_MMU # mosquitto
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
-	depends on !BR2_STATIC_LIBS # mosquitto
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # sleep_for
 	# pthread_condattr_setclock
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
Signature · 1 line
2.25.3
#1 lore raw

PATCH 1/1 package/{collectd, domoticz}: fix outdated dependencies for mosquitto

Quoted 32 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Titouan" == Titouan Christophe <[email protected]> writes:

In 4fc62e1eb6b3adbfc3d3eb7f841275ae8cd1b424, we removed arch/toolchain dependencies from the mosquitto library (MMU, !STATIC, SYNC4), and moved them to the mosquitto broker only.

All the packages modified here only need the mosquitto library, so they shouldn't have those depends anymore; but this was never done before.

---
 package/collectd/Config.in | 1 -
 package/domoticz/Config.in | 3 ---
 2 files changed, 4 deletions(-)
package/collectd/Config.in +0 -1
index 4f54944cbc..ddf64015bd 100644
@@ -607,7 +607,6 @@ comment "grpc needs a toolchain w/ C++, gcc >= 4.8"
 
 config BR2_PACKAGE_COLLECTD_MQTT
 	bool "mqtt"
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
 	select BR2_PACKAGE_MOSQUITTO
 	help
 	  Sends metrics to and/or receives metrics from an MQTT broker.
package/domoticz/Config.in +0 -0
index c713ac58b1..a2ad9f1b07 100644

package/domoticz/Config.in line 3

Quoted 3 lines
package/domoticz/Config.in +0 -1
@@ -1,8 +1,5 @@
 config BR2_PACKAGE_DOMOTICZ
 	bool "domoticz"
-	depends on BR2_USE_MMU # mosquitto

the domoticz code has a bunch of references to fork(), so I've kept this.

package/domoticz/Config.in line 5

Quoted 2 lines
package/domoticz/Config.in +0 -2
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
-	depends on !BR2_STATIC_LIBS # mosquitto

CMakeLists.txt explicitly checks for libmosquitto.so:

find_library(MQTT_LIBRARIES NAMES libmosquitto.so)

So I've left that as well.

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/{collectd, domoticz}: fix outdated dependencies for mosquitto

In reply to Titouan Christophe
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Titouan" == Titouan Christophe <[email protected]> writes:

In 4fc62e1eb6b3adbfc3d3eb7f841275ae8cd1b424, we removed arch/toolchain dependencies from the mosquitto library (MMU, !STATIC, SYNC4), and moved them to the mosquitto broker only.

All the packages modified here only need the mosquitto library, so they shouldn't have those depends anymore; but this was never done before.

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard