[Buildroot] [PATCH 1/1] jsoncpp: do not always build static library

[Buildroot] [PATCH 1/1] jsoncpp: do not always build static library

[Fabrice Fontaine]

Currently, static libray is always built as BUILD_STATIC_LIBS is ON by
default so correctly set BUILD_STATIC_LIBS and BUILD_SHARED_LIBS
depending on BR2_xxx_LIBS variables

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/jsoncpp/jsoncpp.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk
index 3a2ee087b3..eb471561f0 100644
--- a/package/jsoncpp/jsoncpp.mk
+++ b/package/jsoncpp/jsoncpp.mk
@@ -15,4 +15,12 @@ JSONCPP_CONF_OPTS += \
 	-DJSONCPP_WITH_TESTS=OFF \
 	-DJSONCPP_WITH_STRICT_ISO=OFF
 
+ifeq ($(BR2_STATIC_LIBS),y)
+JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON
+endif
+
 $(eval $(cmake-package))
-- 
2.14.1

[Buildroot] [PATCH 1/1] jsoncpp: do not always build static library

[Thomas Petazzoni]

Hello,

On Wed,  7 Mar 2018 22:18:42 +0100, Fabrice Fontaine wrote:

> +ifeq ($(BR2_STATIC_LIBS),y)
> +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF
> +else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
> +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON
> +else ifeq ($(BR2_SHARED_LIBS),y)
> +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON
> +endif

BUILD_SHARED_LIBS=ON/OFF is already passed by package/pkg-cmake.mk. I
don't think we need to replicate it here.

So, just:

ifeq ($(BR2_SHARED_LIBS),y)
JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
else
JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
endif

is enough, no?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com

[Buildroot] [PATCH 1/1] jsoncpp: do not always build static library

[Fabrice Fontaine]

Dear Thomas,

2018-03-07 22:32 GMT+01:00 Thomas Petazzoni <thomas.petazzoni@bootlin.com>:

> Hello,
>
> On Wed,  7 Mar 2018 22:18:42 +0100, Fabrice Fontaine wrote:
>
> > +ifeq ($(BR2_STATIC_LIBS),y)
> > +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF
> > +else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
> > +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON
> > +else ifeq ($(BR2_SHARED_LIBS),y)
> > +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON
> > +endif
>
> BUILD_SHARED_LIBS=ON/OFF is already passed by package/pkg-cmake.mk. I
> don't think we need to replicate it here.
>
> So, just:
>
> ifeq ($(BR2_SHARED_LIBS),y)
> JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
> else
> JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
> endif
>
> is enough, no?
>
You're right, I will update the patch accordingly.

>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> http://bootlin.com
>
Best Regards,

Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180307/e54d4a6c/attachment.html>