package/zeromq: drop AUTORECONF
PATCH 1/2 package/zeromq: drop AUTORECONF
Commit 64ec0541d56cb05aa5898c42f26dd6b531d9b96a forgot to drop ZEROMQ_AUTORECONF
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/zeromq/zeromq.mk | 2 -- 1 file changed, 2 deletions(-)
package/zeromq/zeromq.mk +0 -2
@@ -11,8 +11,6 @@ ZEROMQ_DEPENDENCIES = util-linux ZEROMQ_CONF_OPTS = --disable-Werror --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER -# We're patching configure.ac -ZEROMQ_AUTORECONF = YES # Assume these flags are always available. It is true, at least for # SOCK_CLOEXEC, since linux v2.6.27.
Signature · 1 line
2.29.2
PATCH 2/2 package/zeromq: add websocket option
websocket support is available since version 4.3.3 and
https://github.com/zeromq/libzmq/commit/9be833493877258af3bc6acdc65565db6674768d
It is enabled if --enable-drafts is passed by the user.
websocket can use libnss or gnutls instead of its builtin SHA1 since
https://github.com/zeromq/libzmq/commit/7296fb5b151920a4a8d272da69196df8ca155aa1
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/zeromq/Config.in | 5 +++++ package/zeromq/zeromq.mk | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+)
package/zeromq/Config.in +5 -0
@@ -59,4 +59,9 @@ config BR2_PACKAGE_ZEROMQ_DRAFTS https://pyzmq.readthedocs.io/en/latest/draft.html +config BR2_PACKAGE_ZEROMQ_WEBSOCKET + bool "WebSocket support" + help + Enable WebSocket transport + endif
package/zeromq/zeromq.mk +20 -0
@@ -53,6 +53,19 @@ else ZEROMQ_CONF_OPTS += --disable-drafts endif +ifeq ($(BR2_PACKAGE_ZEROMQ_WEBSOCKET),y) +ZEROMQ_CONF_OPTS += --enable-ws +else +ZEROMQ_CONF_OPTS += --disable-ws +endif + +ifeq ($(BR2_PACKAGE_GNUTLS),y) +ZEROMQ_DEPENDENCIES += host-pkgconf gnutls +ZEROMQ_CONF_OPTS += --with-tls +else +ZEROMQ_CONF_OPTS += --without-tls +endif + ifeq ($(BR2_PACKAGE_LIBBSD),y) ZEROMQ_DEPENDENCIES += host-pkgconf libbsd ZEROMQ_CONF_OPTS += --enable-libbsd
@@ -60,6 +73,13 @@ else ZEROMQ_CONF_OPTS += --disable-libbsd endif +ifeq ($(BR2_PACKAGE_LIBNSS),y) +ZEROMQ_DEPENDENCIES += host-pkgconf libnss +ZEROMQ_CONF_OPTS += --with-nss +else +ZEROMQ_CONF_OPTS += --without-nss +endif + # ZeroMQ uses libsodium if it's available. ifeq ($(BR2_PACKAGE_LIBSODIUM),y) ZEROMQ_DEPENDENCIES += libsodium
Signature · 1 line
2.29.2
PATCH 1/2 package/zeromq: drop AUTORECONF
In reply to Fabrice FontaineQuoted 7 lines · On Fri, 22 Jan 2021 23:37:22 +0100 Fabrice Fontaine…
Commit
64ec0541d56cb05aa5898c42f26dd6b531d9b96aforgot to dropZEROMQ_AUTORECONFSigned-off-by Fabrice Fontaine <[email protected]>--- package/zeromq/zeromq.mk | 2 -- 1 file changed, 2 deletions(-)
Both applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com