From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCHv2] dnsmasq: fix overwritten PKG_CONFIG
Date: Fri, 2 Sep 2016 11:22:35 +0200 [thread overview]
Message-ID: <20160902092235.slbzczjnmjfiz3wd@pengutronix.de> (raw)
In-Reply-To: <1471854636-22729-1-git-send-email-r.schwebel@pengutronix.de>
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
next prev parent reply other threads:[~2016-09-02 9:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-22 8:30 Robert Schwebel
2016-09-02 9:22 ` Michael Olbrich [this message]
2016-09-04 19:03 ` Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160902092235.slbzczjnmjfiz3wd@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox