All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] libxmlrpc: fix static build
@ 2015-06-09 14:20 Baruch Siach
  2015-06-12 21:13 ` Thomas Petazzoni
  0 siblings, 1 reply; 6+ messages in thread
From: Baruch Siach @ 2015-06-09 14:20 UTC (permalink / raw)
  To: buildroot

Fixes:
http://autobuild.buildroot.net/results/16d/16de14ace7b4e089f56b9cb173542e487cae3a9d/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/libxmlrpc/libxmlrpc.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
index c3788d6c3f36..a6137e07b828 100644
--- a/package/libxmlrpc/libxmlrpc.mk
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -35,4 +35,14 @@ LIBXMLRPC_MAKE_ENV = \
 	CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)"
 
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
+endif
+
+LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS)
+LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
+	DESTDIR=$(STAGING_DIR) install
+LIBXMLRPC_INSTALL_TARGET_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
+	DESTDIR=$(TARGET_DIR) install
+
 $(eval $(autotools-package))
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: fix static build
  2015-06-09 14:20 [Buildroot] [PATCH] libxmlrpc: fix static build Baruch Siach
@ 2015-06-12 21:13 ` Thomas Petazzoni
  2015-06-14 19:07   ` Baruch Siach
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2015-06-12 21:13 UTC (permalink / raw)
  To: buildroot

Dear Baruch Siach,

On Tue,  9 Jun 2015 17:20:09 +0300, Baruch Siach wrote:
> Fixes:
> http://autobuild.buildroot.net/results/16d/16de14ace7b4e089f56b9cb173542e487cae3a9d/
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/libxmlrpc/libxmlrpc.mk | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
> index c3788d6c3f36..a6137e07b828 100644
> --- a/package/libxmlrpc/libxmlrpc.mk
> +++ b/package/libxmlrpc/libxmlrpc.mk
> @@ -35,4 +35,14 @@ LIBXMLRPC_MAKE_ENV = \
>  	CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
>  	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)"
>  
> +ifeq ($(BR2_STATIC_LIBS),y)
> +LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
> +endif
> +
> +LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS)
> +LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
> +	DESTDIR=$(STAGING_DIR) install
> +LIBXMLRPC_INSTALL_TARGET_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
> +	DESTDIR=$(TARGET_DIR) install
> +
>  $(eval $(autotools-package))

Can you try instead something like:

ifeq ($(BR2_STATIC_LIBS),y)
LIBXMLRPC_MAKE_ENV += SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
endif

The advantage is that LIBXMLRPC_MAKE_ENV is passed to the build,
install staging and install target steps.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: fix static build
  2015-06-12 21:13 ` Thomas Petazzoni
@ 2015-06-14 19:07   ` Baruch Siach
  2015-06-14 21:00     ` Thomas Petazzoni
  0 siblings, 1 reply; 6+ messages in thread
From: Baruch Siach @ 2015-06-14 19:07 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

On Fri, Jun 12, 2015 at 11:13:07PM +0200, Thomas Petazzoni wrote:
> On Tue,  9 Jun 2015 17:20:09 +0300, Baruch Siach wrote:
> > Fixes:
> > http://autobuild.buildroot.net/results/16d/16de14ace7b4e089f56b9cb173542e487cae3a9d/
> > 
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> >  package/libxmlrpc/libxmlrpc.mk | 10 ++++++++++
> >  1 file changed, 10 insertions(+)
> > 
> > diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
> > index c3788d6c3f36..a6137e07b828 100644
> > --- a/package/libxmlrpc/libxmlrpc.mk
> > +++ b/package/libxmlrpc/libxmlrpc.mk
> > @@ -35,4 +35,14 @@ LIBXMLRPC_MAKE_ENV = \
> >  	CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
> >  	LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)"
> >  
> > +ifeq ($(BR2_STATIC_LIBS),y)
> > +LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
> > +endif
> > +
> > +LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS)
> > +LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
> > +	DESTDIR=$(STAGING_DIR) install
> > +LIBXMLRPC_INSTALL_TARGET_OPTS = $(LIBXMLRPC_STATIC_OPTS) \
> > +	DESTDIR=$(TARGET_DIR) install
> > +
> >  $(eval $(autotools-package))
> 
> Can you try instead something like:
> 
> ifeq ($(BR2_STATIC_LIBS),y)
> LIBXMLRPC_MAKE_ENV += SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N
> endif

Unfortunately, these make variables are set explicitly in common.mk. So 
passing them in make environment has no effect.

> The advantage is that LIBXMLRPC_MAKE_ENV is passed to the build,
> install staging and install target steps.

Now that I think about it, why don't we have a similar thing for MAKE_OPTS, 
say, $(PKG)_MAKE_VARS. Something like (untested, host packages missing):

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 1d694f0618fc..27ff16235f27 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -154,10 +154,10 @@ endif
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPTS			?=
 $(2)_MAKE_ENV			?=
-$(2)_MAKE_OPTS			?=
-$(2)_INSTALL_OPTS                ?= install
-$(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR)  install
+$(2)_MAKE_OPTS			?= $$($(2)_MAKE_VARS)
+$(2)_INSTALL_OPTS		?= $$($(2)_MAKE_VARS) install
+$(2)_INSTALL_STAGING_OPTS	?= $$($(2)_MAKE_VARS) DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_TARGET_OPTS	?= $$($(2)_MAKE_VARS) DESTDIR=$$(TARGET_DIR) install
 
 # This must be repeated from inner-generic-package, otherwise we get an empty
 # _DEPENDENCIES if _AUTORECONF is YES.  Also filter the result of _AUTORECONF

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: fix static build
  2015-06-14 19:07   ` Baruch Siach
@ 2015-06-14 21:00     ` Thomas Petazzoni
  2015-06-14 21:48       ` Arnout Vandecappelle
  2015-06-19  4:34       ` Baruch Siach
  0 siblings, 2 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2015-06-14 21:00 UTC (permalink / raw)
  To: buildroot

Dear Baruch Siach,

On Sun, 14 Jun 2015 22:07:38 +0300, Baruch Siach wrote:

> Unfortunately, these make variables are set explicitly in common.mk. So 
> passing them in make environment has no effect.

Argh, ok.

> Now that I think about it, why don't we have a similar thing for MAKE_OPTS, 
> say, $(PKG)_MAKE_VARS. Something like (untested, host packages missing):
> 
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> index 1d694f0618fc..27ff16235f27 100644
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -154,10 +154,10 @@ endif
>  $(2)_CONF_ENV			?=
>  $(2)_CONF_OPTS			?=
>  $(2)_MAKE_ENV			?=
> -$(2)_MAKE_OPTS			?=
> -$(2)_INSTALL_OPTS                ?= install
> -$(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
> -$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR)  install
> +$(2)_MAKE_OPTS			?= $$($(2)_MAKE_VARS)
> +$(2)_INSTALL_OPTS		?= $$($(2)_MAKE_VARS) install
> +$(2)_INSTALL_STAGING_OPTS	?= $$($(2)_MAKE_VARS) DESTDIR=$$(STAGING_DIR) install
> +$(2)_INSTALL_TARGET_OPTS	?= $$($(2)_MAKE_VARS) DESTDIR=$$(TARGET_DIR) install

Why not. Though I'd be more convinced if there is some evidence that it
would also be useful for other packages.

Or maybe we simply need to make $(2)_MAKE_OPTS used for both the build
and install steps?

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: fix static build
  2015-06-14 21:00     ` Thomas Petazzoni
@ 2015-06-14 21:48       ` Arnout Vandecappelle
  2015-06-19  4:34       ` Baruch Siach
  1 sibling, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-06-14 21:48 UTC (permalink / raw)
  To: buildroot

On 06/14/15 23:00, Thomas Petazzoni wrote:
> Dear Baruch Siach,
> 
> On Sun, 14 Jun 2015 22:07:38 +0300, Baruch Siach wrote:
> 
>> Unfortunately, these make variables are set explicitly in common.mk. So 
>> passing them in make environment has no effect.
> 
> Argh, ok.
> 
>> Now that I think about it, why don't we have a similar thing for MAKE_OPTS, 
>> say, $(PKG)_MAKE_VARS. Something like (untested, host packages missing):
>>
>> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
>> index 1d694f0618fc..27ff16235f27 100644
>> --- a/package/pkg-autotools.mk
>> +++ b/package/pkg-autotools.mk
>> @@ -154,10 +154,10 @@ endif
>>  $(2)_CONF_ENV			?=
>>  $(2)_CONF_OPTS			?=
>>  $(2)_MAKE_ENV			?=
>> -$(2)_MAKE_OPTS			?=
>> -$(2)_INSTALL_OPTS                ?= install
>> -$(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
>> -$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR)  install
>> +$(2)_MAKE_OPTS			?= $$($(2)_MAKE_VARS)
>> +$(2)_INSTALL_OPTS		?= $$($(2)_MAKE_VARS) install
>> +$(2)_INSTALL_STAGING_OPTS	?= $$($(2)_MAKE_VARS) DESTDIR=$$(STAGING_DIR) install
>> +$(2)_INSTALL_TARGET_OPTS	?= $$($(2)_MAKE_VARS) DESTDIR=$$(TARGET_DIR) install
> 
> Why not. Though I'd be more convinced if there is some evidence that it
> would also be useful for other packages.
> 
> Or maybe we simply need to make $(2)_MAKE_OPTS used for both the build
> and install steps?

 Well, MAKE_OPTS includes the target that has to be built, so it can't just be
reused as is for _INSTALL. So Baruch's proposal makes more sense to me.

 Regards,
 Arnout

> 
> Best regards,
> 
> Thomas
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] libxmlrpc: fix static build
  2015-06-14 21:00     ` Thomas Petazzoni
  2015-06-14 21:48       ` Arnout Vandecappelle
@ 2015-06-19  4:34       ` Baruch Siach
  1 sibling, 0 replies; 6+ messages in thread
From: Baruch Siach @ 2015-06-19  4:34 UTC (permalink / raw)
  To: buildroot

Hi Thomas,

On Sun, Jun 14, 2015 at 11:00:49PM +0200, Thomas Petazzoni wrote:
> On Sun, 14 Jun 2015 22:07:38 +0300, Baruch Siach wrote:
> > Unfortunately, these make variables are set explicitly in common.mk. So 
> > passing them in make environment has no effect.
> 
> Argh, ok.
> 
> > Now that I think about it, why don't we have a similar thing for MAKE_OPTS, 
> > say, $(PKG)_MAKE_VARS. Something like (untested, host packages missing):
> > 
> > diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> > index 1d694f0618fc..27ff16235f27 100644
> > --- a/package/pkg-autotools.mk
> > +++ b/package/pkg-autotools.mk
> > @@ -154,10 +154,10 @@ endif
> >  $(2)_CONF_ENV			?=
> >  $(2)_CONF_OPTS			?=
> >  $(2)_MAKE_ENV			?=
> > -$(2)_MAKE_OPTS			?=
> > -$(2)_INSTALL_OPTS                ?= install
> > -$(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
> > -$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR)  install
> > +$(2)_MAKE_OPTS			?= $$($(2)_MAKE_VARS)
> > +$(2)_INSTALL_OPTS		?= $$($(2)_MAKE_VARS) install
> > +$(2)_INSTALL_STAGING_OPTS	?= $$($(2)_MAKE_VARS) DESTDIR=$$(STAGING_DIR) install
> > +$(2)_INSTALL_TARGET_OPTS	?= $$($(2)_MAKE_VARS) DESTDIR=$$(TARGET_DIR) install
> 
> Why not. Though I'd be more convinced if there is some evidence that it
> would also be useful for other packages.

I looked around and I found a few more packages that might benefit from 
_MAKE_VARS. But I thing the gain is not enough to worth the trouble. Adding 
$(2)_MAKE_VARS might also lead to confusion when a user sets both _MAKE_VARS 
and one or more other _OPTS, thus silently overriding _MAKE_VARS in a way that 
is not apparent to the reader.

So, I suggest to just apply the original patch.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-06-19  4:34 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-09 14:20 [Buildroot] [PATCH] libxmlrpc: fix static build Baruch Siach
2015-06-12 21:13 ` Thomas Petazzoni
2015-06-14 19:07   ` Baruch Siach
2015-06-14 21:00     ` Thomas Petazzoni
2015-06-14 21:48       ` Arnout Vandecappelle
2015-06-19  4:34       ` Baruch Siach

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.