[Buildroot] [PATCH 1/1] package/mosquitto: fix static linking with c-ares and openssl
Peter Korsgaard
peter at korsgaard.com
Wed Aug 7 07:46:18 UTC 2019
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice at gmail.com> writes:
> Add WITH_TLS_STATIC_LIB_DEPS to fix static linking with openssl and
> c-ares as using STATIC_LIB_DEPS override internal settings such as
> -lcares
> Fixes:
> - http://autobuild.buildroot.org/results/0a25229241aa20b98747d9abe8b1363033126e9e
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
> ...nfig.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch | 41 +++++++++++++++++++
> package/mosquitto/mosquitto.mk | 2 +-
> 2 files changed, 42 insertions(+), 1 deletion(-)
> create mode 100644 package/mosquitto/0001-config.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch
> diff --git a/package/mosquitto/0001-config.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch b/package/mosquitto/0001-config.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch
> new file mode 100644
> index 0000000000..fcc169aaca
> --- /dev/null
> +++ b/package/mosquitto/0001-config.mk-add-WITH_TLS_STATIC_LIB_DEPS.patch
> @@ -0,0 +1,41 @@
> +From 9a1ea149d3451d4edf32c5f0f0d1b4fecfbff4a2 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> +Date: Tue, 6 Aug 2019 22:11:57 +0200
> +Subject: [PATCH] config.mk: add WITH_TLS_STATIC_LIB_DEPS
> +
> +Add WITH_TLS_STATIC_LIB_DEPS to allow the user to give openssl static
> +libraries dependencies such as -lz or -latomic
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> +[Upstream status: https://github.com/eclipse/mosquitto/pull/1371]
> +---
> + config.mk | 6 +++++-
> + 1 file changed, 5 insertions(+), 1 deletion(-)
> +
> +diff --git a/config.mk b/config.mk
> +index 6c23bef..c9e2daf 100644
> +--- a/config.mk
> ++++ b/config.mk
> +@@ -23,6 +23,10 @@
> + # password authentication at all.
> + WITH_TLS:=yes
> +
> ++# Use this variable to give openssl static libraries dependencies (such as -lz
> ++# or -latomic) that can be retrieved for example by pkg-config
> ++WITH_TLS_STATIC_LIB_DEPS:=
> ++
> + # Comment out to disable TLS/PSK support in the broker and client. Requires
> + # WITH_TLS=yes.
> + # This must be disabled if using openssl < 1.0.
> +@@ -202,7 +206,7 @@ ifeq ($(WITH_TLS),yes)
> + LIB_CPPFLAGS:=$(LIB_CPPFLAGS) -DWITH_TLS
> + PASSWD_LDADD:=$(PASSWD_LDADD) -lcrypto
> + CLIENT_CPPFLAGS:=$(CLIENT_CPPFLAGS) -DWITH_TLS
> +- STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lssl -lcrypto
> ++ STATIC_LIB_DEPS:=$(STATIC_LIB_DEPS) -lssl -lcrypto $(WITH_TLS_STATIC_LIB_DEPS)
Maybe WITH_TLS_STATIC_LIB_DEPS should default to -lssl -lcrypto and
those dropped from here, but lets hear what upstream says.
In the mean time we should fix the build issues - So committed, thanks.
--
Bye, Peter Korsgaard
More information about the buildroot
mailing list