From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/3] package/mosquitto: allow to build as static lib
Date: Thu, 01 Aug 2019 12:23:35 +0200 [thread overview]
Message-ID: <871ry518wo.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20190718100636.27290-2-titouan.christophe@railnova.eu> (Titouan Christophe's message of "Thu, 18 Jul 2019 12:06:34 +0200")
>>>>> "Titouan" == Titouan Christophe <titouan.christophe@railnova.eu> writes:
> Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
> ---
> package/mosquitto/Config.in | 4 ----
> package/mosquitto/mosquitto.mk | 6 ++++++
> 2 files changed, 6 insertions(+), 4 deletions(-)
> diff --git a/package/mosquitto/Config.in b/package/mosquitto/Config.in
> index 11b6d7891b..7135e86e69 100644
> --- a/package/mosquitto/Config.in
> +++ b/package/mosquitto/Config.in
> @@ -1,6 +1,5 @@
> config BR2_PACKAGE_MOSQUITTO
> bool "mosquitto"
> - depends on !BR2_STATIC_LIBS # builds .so
> help
> Mosquitto is an open source message broker that implements
> the MQ Telemetry Transport protocol versions 3.1 and
> @@ -22,6 +21,3 @@ config BR2_PACKAGE_MOSQUITTO_BROKER
> comment "mosquitto broker needs a system with MMU"
> depends on BR2_PACKAGE_MOSQUTTO && !BR2_USE_MMU
> -
> -comment "mosquitto needs a toolchain w/ dynamic library"
> - depends on BR2_STATIC_LIBS
> diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk
> index 51c0abd0ba..ed72af754a 100644
> --- a/package/mosquitto/mosquitto.mk
> +++ b/package/mosquitto/mosquitto.mk
> @@ -17,6 +17,12 @@ MOSQUITTO_MAKE_OPTS = \
> WITH_WRAP=no \
> WITH_DOCS=no
> +ifeq ($(BR2_STATIC_LIBS),y)
> +MOSQUITTO_MAKE_OPTS += WITH_STATIC_LIBRARIES=yes WITH_SHARED_LIBRARIES=no
> +else
> +MOSQUITTO_MAKE_OPTS += WITH_STATIC_LIBRARIES=no WITH_SHARED_LIBRARIES=yes
> +endif
We actually have 3 variants:
- static only (BR2_STATIC_LIBS)
- shared only (BR2_SHARED_LIBS)
- shared and static (BR2_SHARED_STATIC_LIBS)
So I reworked it to take that into consideration and committed, thanks.
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2019-08-01 10:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 10:06 [Buildroot] [PATCH 0/3] Update package mosquitto Titouan Christophe
2019-07-18 10:06 ` [Buildroot] [PATCH 1/3] package/mosquitto: allow to build as static lib Titouan Christophe
2019-08-01 10:23 ` Peter Korsgaard [this message]
2019-08-01 10:41 ` Peter Korsgaard
2019-08-01 17:09 ` Titouan Christophe
2019-08-01 17:25 ` Peter Korsgaard
2019-08-02 13:18 ` Titouan Christophe
2019-08-02 15:58 ` Peter Korsgaard
2019-07-18 10:06 ` [Buildroot] [PATCH 2/3] package/mosquitto: Switch systemd unit to Type=notify and depend on network Titouan Christophe
2019-08-01 10:27 ` Peter Korsgaard
2019-08-02 8:51 ` Titouan Christophe
2019-07-18 10:06 ` [Buildroot] [PATCH 3/3] package/mosquitto: bump to v1.6.3 Titouan Christophe
2019-08-01 10:48 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2019-08-03 9:38 [Buildroot] [PATCH v2 0/3] Update package mosquitto Titouan Christophe
2019-08-03 9:38 ` [Buildroot] [PATCH 1/3] package/mosquitto: allow to build as static lib Titouan Christophe
2019-08-03 11:13 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871ry518wo.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox