* [ptxdist] [PATCHv2] dnsmasq: fix overwritten PKG_CONFIG
@ 2016-08-22 8:30 Robert Schwebel
2016-09-02 9:22 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Robert Schwebel @ 2016-08-22 8:30 UTC (permalink / raw)
To: ptxdist; +Cc: Robert Schwebel
The dnsmasq package has a handwritten Makefile, which overwrites the
PKG_CONFIG set by ptxdist.
Set the variable to the right value.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
Changes since (implicit) v1:
* break long lines
rules/dnsmasq.make | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index a9e3e49..7693e93 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -59,7 +59,11 @@ ifdef DNSMASQ_DNSSEC
DNSMASQ_COPT += -DHAVE_DNSSEC
endif
-DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)'
+DNSMASQ_MAKEVARS := \
+ PREFIX=/usr \
+ AWK=awk \
+ COPTS='$(DNSMASQ_COPT)' \
+ PKG_CONFIG='$(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config'
$(STATEDIR)/dnsmasq.prepare:
@$(call targetinfo)
--
2.8.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCHv2] dnsmasq: fix overwritten PKG_CONFIG
2016-08-22 8:30 [ptxdist] [PATCHv2] dnsmasq: fix overwritten PKG_CONFIG Robert Schwebel
@ 2016-09-02 9:22 ` Michael Olbrich
2016-09-04 19:03 ` Robert Schwebel
0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2016-09-02 9:22 UTC (permalink / raw)
To: ptxdist
On Mon, Aug 22, 2016 at 10:30:36AM +0200, Robert Schwebel wrote:
> The dnsmasq package has a handwritten Makefile, which overwrites the
> PKG_CONFIG set by ptxdist.
>
> Set the variable to the right value.
>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>
> Changes since (implicit) v1:
>
> * break long lines
>
> rules/dnsmasq.make | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
> index a9e3e49..7693e93 100644
> --- a/rules/dnsmasq.make
> +++ b/rules/dnsmasq.make
> @@ -59,7 +59,11 @@ ifdef DNSMASQ_DNSSEC
> DNSMASQ_COPT += -DHAVE_DNSSEC
> endif
>
> -DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)'
> +DNSMASQ_MAKEVARS := \
> + PREFIX=/usr \
> + AWK=awk \
> + COPTS='$(DNSMASQ_COPT)' \
> + PKG_CONFIG='$(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config'
What's the error here? The Makefile sets PKG_CONFIG=pkg-config and with
"DNSMASQ_COMPILE_ENV := $(CROSS_ENV)" this should find
$(PTXDIST_SYSROOT_CROSS)/bin/pkg-config. And that's the same as
$(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config
Michael
>
> $(STATEDIR)/dnsmasq.prepare:
> @$(call targetinfo)
> --
> 2.8.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCHv2] dnsmasq: fix overwritten PKG_CONFIG
2016-09-02 9:22 ` Michael Olbrich
@ 2016-09-04 19:03 ` Robert Schwebel
0 siblings, 0 replies; 3+ messages in thread
From: Robert Schwebel @ 2016-09-04 19:03 UTC (permalink / raw)
To: ptxdist
On Fri, Sep 02, 2016 at 11:22:35AM +0200, Michael Olbrich wrote:
> On Mon, Aug 22, 2016 at 10:30:36AM +0200, Robert Schwebel wrote:
> > The dnsmasq package has a handwritten Makefile, which overwrites the
> > PKG_CONFIG set by ptxdist.
> >
> > Set the variable to the right value.
> >
> > Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> > ---
> >
> > Changes since (implicit) v1:
> >
> > * break long lines
> >
> > rules/dnsmasq.make | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
> > index a9e3e49..7693e93 100644
> > --- a/rules/dnsmasq.make
> > +++ b/rules/dnsmasq.make
> > @@ -59,7 +59,11 @@ ifdef DNSMASQ_DNSSEC
> > DNSMASQ_COPT += -DHAVE_DNSSEC
> > endif
> >
> > -DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)'
> > +DNSMASQ_MAKEVARS := \
> > + PREFIX=/usr \
> > + AWK=awk \
> > + COPTS='$(DNSMASQ_COPT)' \
> > + PKG_CONFIG='$(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config'
>
> What's the error here? The Makefile sets PKG_CONFIG=pkg-config and with
> "DNSMASQ_COMPILE_ENV := $(CROSS_ENV)" this should find
> $(PTXDIST_SYSROOT_CROSS)/bin/pkg-config. And that's the same as
> $(PTXDIST_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config
Hmm, it seems that I can't reproduce it any more. I've instrumented the
pkg-config calls, and it seems you are right. So let's drop this patch
for now.
Btw, the makefile is broken in more ways and basically works by
accident; it does things like:
if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi
etc.
rsc
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-04 19:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-22 8:30 [ptxdist] [PATCHv2] dnsmasq: fix overwritten PKG_CONFIG Robert Schwebel
2016-09-02 9:22 ` Michael Olbrich
2016-09-04 19:03 ` Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox