jsoncpp: do not always build static library

PATCH Superseded Fabrice Fontaine 2 participants 3 messages Mar 7, 2018

Share & tools

Fabrice Fontaine

author

2018-03-07 21:18 UTC #0 lore raw

PATCH 1/1 jsoncpp: do not always build static library

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 <[email protected]>

---
 package/jsoncpp/jsoncpp.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

package/jsoncpp/jsoncpp.mk +8 -0

index 3a2ee087b3..eb471561f0 100644
@@ -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))

Signature · 1 line

2.14.1

Thomas Petazzoni

2018-03-07 21:32 UTC #1 lore raw

PATCH 1/1 jsoncpp: do not always build static library

Hello,

package/jsoncpp/jsoncpp.mk JSONCPP_CONF_OPTS += \ · line 24

Quoted 7 lines · Fabrice Fontaine

package/jsoncpp/jsoncpp.mk +7 -0

+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

Signature · 3 lines

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

Fabrice Fontaine

author

2018-03-07 21:38 UTC #2 lore raw

PATCH 1/1 jsoncpp: do not always build static library

Dear Thomas,

2018-03-07 22:32 GMT+01:00 Thomas Petazzoni <[email protected]>:

Quoted 17 lines

Hello,
package/jsoncpp/jsoncpp.mk JSONCPP_CONF_OPTS += \ · line 24
Quoted 7 lines · Fabrice Fontaine
package/jsoncpp/jsoncpp.mk +7 -0
+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:

Quoted 8 lines

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.

Quoted 9 lines

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>