mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de, Jon Ringle <jon@ringle.org>
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [ptxdist] [PATCH] host-autotools-autoconf: fix m4 path
Date: Fri, 22 Feb 2019 09:14:03 +0100	[thread overview]
Message-ID: <20190222081403.23550-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <CAMwGMjz7n56iZ4Kik_Jv4pn1CxaO2GozJzAMeJu4JA-WXS8wMg@mail.gmail.com>

Make sure the path for m4 is just /bin/m4 and then fix it correctly in
host-autotools-autoconf.install.post. Otherwise the absolute path to
sysroot-host is part of the dev package.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---

Hi,

Can you check, if you get a correct dev package for host-autotools-autoconf
with this?

Michael

 rules/host-autotools-autoconf.make | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rules/host-autotools-autoconf.make b/rules/host-autotools-autoconf.make
index 9f9c4de94c4e..9c2f516ddc45 100644
--- a/rules/host-autotools-autoconf.make
+++ b/rules/host-autotools-autoconf.make
@@ -35,6 +35,11 @@ $(STATEDIR)/autogen-tools: $(STATEDIR)/host-autotools-autoconf.install.post
 # Prepare
 # ----------------------------------------------------------------------------
 
+# Note: the path for m4 will be fixed in .install.post
+HOST_AUTOTOOLS_AUTOCONF_CONF_ENV	:= \
+	$(HOST_ENV) \
+	ac_cv_path_M4=/bin/m4
+
 #
 # autoconf
 #
@@ -48,7 +53,7 @@ $(STATEDIR)/host-autotools-autoconf.install.post:
 	@$(call targetinfo)
 	@sed -i \
 		-e "s;'\(/share/autoconf\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
-		-e "s;'\(/bin/\(m4\)\?\(auto[^']*\)\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
+		-e "s;'\(/bin/\(m4\|auto[^']*\)\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
 		$(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/bin/* \
 		$(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/share/autoconf/autom4te.cfg
 	@$(call world/install.post, HOST_AUTOTOOLS_AUTOCONF)
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  reply	other threads:[~2019-02-22  8:14 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-18 20:18 [ptxdist] host-autoconf: hardcoded path to m4 Jon Ringle
2019-02-22  8:14 ` Michael Olbrich [this message]
2019-02-22 12:59   ` [ptxdist] [PATCH] host-autotools-autoconf: fix m4 path Michael Olbrich
2019-02-22 13:19     ` Michael Olbrich
2019-02-22 18:08   ` Jon Ringle

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=20190222081403.23550-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=jon@ringle.org \
    --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