aboutsummaryrefslogtreecommitdiff
path: root/package/mosquitto/mosquitto.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/mosquitto/mosquitto.mk')
-rw-r--r--package/mosquitto/mosquitto.mk24
1 files changed, 16 insertions, 8 deletions
diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk
index 5734dd45c5..6842ee4e49 100644
--- a/package/mosquitto/mosquitto.mk
+++ b/package/mosquitto/mosquitto.mk
@@ -4,13 +4,14 @@
#
################################################################################
-MOSQUITTO_VERSION = 1.6.12
+MOSQUITTO_VERSION = 2.0.4
MOSQUITTO_SITE = https://mosquitto.org/files/source
-MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
-MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
+MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0
+MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10
MOSQUITTO_INSTALL_STAGING = YES
MOSQUITTO_MAKE_OPTS = \
+ CLIENT_STATIC_LDADD="$(MOSQUITTO_STATIC_LIBS)" \
UNAME=Linux \
STRIP=true \
prefix=/usr \
@@ -48,15 +49,22 @@ else
MOSQUITTO_MAKE_OPTS += WITH_THREADING=no
endif
-ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
-MOSQUITTO_DEPENDENCIES += host-pkgconf libopenssl
-MOSQUITTO_MAKE_OPTS += \
- WITH_TLS=yes \
- CLIENT_STATIC_LDADD="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`"
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MOSQUITTO_DEPENDENCIES += host-pkgconf openssl
+MOSQUITTO_MAKE_OPTS += WITH_TLS=yes
+MOSQUITTO_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
else
MOSQUITTO_MAKE_OPTS += WITH_TLS=no
endif
+ifeq ($(BR2_PACKAGE_CJSON),y)
+MOSQUITTO_DEPENDENCIES += cjson
+MOSQUITTO_MAKE_OPTS += WITH_CJSON=yes
+MOSQUITTO_STATIC_LIBS += -lcjson
+else
+MOSQUITTO_MAKE_OPTS += WITH_CJSON=no
+endif
+
ifeq ($(BR2_PACKAGE_C_ARES),y)
MOSQUITTO_DEPENDENCIES += c-ares
MOSQUITTO_MAKE_OPTS += WITH_SRV=yes