| Message ID | 20180307211842.27111-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/1] jsoncpp: do not always build static library | expand |
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
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 <div dir="ltr">Dear Thomas,<br><div><div class="gmail_extra"><br><div class="gmail_quote">2018-03-07 22:32 GMT+01:00 Thomas Petazzoni <span dir="ltr"><<a href="mailto:thomas.petazzoni@bootlin.com" target="_blank">thomas.petazzoni@bootlin.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hello,<br> <span class=""><br> On Wed, 7 Mar 2018 22:18:42 +0100, Fabrice Fontaine wrote:<br> <br> > +ifeq ($(BR2_STATIC_LIBS),y)<br> > +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF<br> > +else ifeq ($(BR2_SHARED_STATIC_LIBS),y)<br> > +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON<br> > +else ifeq ($(BR2_SHARED_LIBS),y)<br> > +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON<br> > +endif<br> <br> </span>BUILD_SHARED_LIBS=ON/OFF is already passed by package/<a href="http://pkg-cmake.mk" rel="noreferrer" target="_blank">pkg-cmake.mk</a>. I<br> don't think we need to replicate it here.<br> <br> So, just:<br> <br> ifeq ($(BR2_SHARED_LIBS),y)<br> JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF<br> else<br> JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON<br> endif<br> <br> is enough, no?<br></blockquote><div>You're right, I will update the patch accordingly. <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> Best regards,<br> <br> Thomas<br> <span class="HOEnZb"><font color="#888888">--<br> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)<br> Embedded Linux and Kernel engineering<br> <a href="http://bootlin.com" rel="noreferrer" target="_blank">http://bootlin.com</a><br> </font></span></blockquote></div>Best Regards,<br><br></div><div class="gmail_extra">Fabrice<br></div></div></div>
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))
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(+)