package/paho-mqtt-c: drop dynamic library dependency
PATCH 1/1 package/paho-mqtt-c: drop dynamic library dependency
paho-mqtt-c can be built statically since version 1.3.3 and
https://github.com/eclipse/paho.mqtt.c/commit/f1459fac2532658a04962ae0ab67b5c3dc92ad75
See https://github.com/eclipse/paho.mqtt.c/issues/848
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/janus-gateway/Config.in | 5 ++--- package/paho-mqtt-c/Config.in | 5 ++--- package/paho-mqtt-c/paho-mqtt-c.mk | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-)
package/janus-gateway/Config.in +2 -3
@@ -59,12 +59,11 @@ comment "transports" config BR2_PACKAGE_JANUS_GATEWAY_MQTT bool "MQTT" - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_PAHO_MQTT_C -comment "MQTT transport needs a toolchain w/ threads and dynamic library support" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "MQTT transport needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ bool "RabbitMQ"
package/paho-mqtt-c/Config.in +2 -3
@@ -1,11 +1,10 @@ config BR2_PACKAGE_PAHO_MQTT_C bool "paho-mqtt-c" - depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_TOOLCHAIN_HAS_THREADS help MQTT client C library https://eclipse.org/paho/clients/c/ -comment "paho-mqtt-c needs a toolchain w/ threads and dynamic library support" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "paho-mqtt-c needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/paho-mqtt-c/paho-mqtt-c.mk +14 -0
@@ -22,4 +22,18 @@ else PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=FALSE endif +ifeq ($(BR2_SHARED_LIBS),y) +PAHO_MQTT_C_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=TRUE \ + -DPAHO_BUILD_STATIC=FALSE +else ifeq ($(BR2_STATIC_LIBS),y) +PAHO_MQTT_C_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=FALSE \ + -DPAHO_BUILD_STATIC=TRUE +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +PAHO_MQTT_C_CONF_OPTS += \ + -DPAHO_BUILD_SHARED=TRUE \ + -DPAHO_BUILD_STATIC=TRUE +endif + $(eval $(cmake-package))
Signature · 1 line
2.26.2
Thomas Petazzoni
AppliedPATCH 1/1 package/paho-mqtt-c: drop dynamic library dependency
Quoted 11 lines · On Thu, 18 Jun 2020 22:38:56 +0200 Fabrice Fontaine…
paho-mqtt-c can be built statically since version 1.3.3 and
https://github.com/eclipse/paho.mqtt.c/commit/f1459fac2532658a04962ae0ab67b5c3dc92ad75See https://github.com/eclipse/paho.mqtt.c/issues/848
Signed-off-by Fabrice Fontaine <[email protected]>--- package/janus-gateway/Config.in | 5 ++--- package/paho-mqtt-c/Config.in | 5 ++--- package/paho-mqtt-c/paho-mqtt-c.mk | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com