mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/paho-mqtt-c: drop dynamic library dependency

Browse Source 
paho-mqtt-c can be built statically since version 1.3.3 and
f1459fac25

See https://github.com/eclipse/paho.mqtt.c/issues/848

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ddde40f371)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2020-06-18 22:38:56 +02:00
committed by Peter Korsgaard
parent 073883278f
commit 75f3570d0c
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/janus-gateway/Config.in
View File

@@ -59,12 +59,11 @@ comment "transports"
config BR2_PACKAGE_JANUS_GATEWAY_MQTT config BR2_PACKAGE_JANUS_GATEWAY_MQTT
bool "MQTT" bool "MQTT"
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_PAHO_MQTT_C select BR2_PACKAGE_PAHO_MQTT_C
comment "MQTT transport needs a toolchain w/ threads and dynamic library support" comment "MQTT transport needs a toolchain w/ threads"
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
bool "RabbitMQ" bool "RabbitMQ"

5
package/paho-mqtt-c/Config.in
View File

@@ -1,11 +1,10 @@
config BR2_PACKAGE_PAHO_MQTT_C config BR2_PACKAGE_PAHO_MQTT_C
bool "paho-mqtt-c" bool "paho-mqtt-c"
depends on !BR2_STATIC_LIBS # dlopen()
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
help help
MQTT client C library MQTT client C library
https://eclipse.org/paho/clients/c/ https://eclipse.org/paho/clients/c/
comment "paho-mqtt-c needs a toolchain w/ threads and dynamic library support" comment "paho-mqtt-c needs a toolchain w/ threads"
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS

14
package/paho-mqtt-c/paho-mqtt-c.mk
View File

@@ -22,4 +22,18 @@ else
PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=FALSE PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=FALSE
endif 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)) $(eval $(cmake-package))