From: Bernhard Walle <bernhard@bwalle.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] make 3.82: Don't rely on sorted wildcard expansion
Date: Thu, 2 Feb 2012 21:23:48 +0100 [thread overview]
Message-ID: <1328214228-7571-1-git-send-email-bernhard@bwalle.de> (raw)
In-Reply-To: <20120201084521.GF32382@pengutronix.de>
Since I switched to make 3.82 on my Mac (from MacPorts), "ptxdist
images" didn't produce any images. I compared the output of make
--debug=all with a working one (from make 3.81 that comes from Apple)
and one difference was the order in reading includes Makefiles.
With make 3.82, the wildcard command doesn't sort any more. See
https://bugzilla.redhat.com/show_bug.cgi?id=635607. This small fix
fixed the issue for me.
Don't ask my why this doesn't show up on Linux. Maybe the return values
of some library function that is make using internally is already
sorted. I have no clue.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
rules/other/Toplevel.make | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make
index 35c2c27..85ad515 100644
--- a/rules/other/Toplevel.make
+++ b/rules/other/Toplevel.make
@@ -39,7 +39,7 @@ include $(PTX_MAP_ALL_MAKE)
include $(RULESDIR)/other/Namespace.make
# might be non existent
-include $(wildcard $(addsuffix /*.make,$(call reverse,$(subst :,$(space),$(PTXDIST_PATH_PRERULES)))))
+include $(foreach dir, $(call reverse,$(subst :,$(space),$(PTXDIST_PATH_PRERULES))), $(sort $(wildcard $(dir)/*.make)))
include $(PTX_DGEN_DEPS_PRE)
include $(PTX_DGEN_RULESFILES_MAKE)
@@ -95,7 +95,7 @@ PTX_PACKAGES_INSTALL := \
$(PACKAGES-b)
# might be non existent
-include $(wildcard $(addsuffix /*.make,$(call reverse,$(subst :,$(space),$(PTXDIST_PATH_POSTRULES)))))
+include $(foreach dir, $(call reverse,$(subst :,$(space),$(PTXDIST_PATH_POSTRULES))), $(sort $(wildcard $(dir)/*.make)))
# install_alternative and install_copy has some configuration defined
# dependencies. include the files specifying these dependencies.
include $(wildcard $(STATEDIR)/*.deps)
--
1.7.7.4
--
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2012-02-02 20:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-29 19:15 Bernhard Walle
2012-01-30 14:06 ` Michael Olbrich
2012-01-30 18:46 ` Bernhard Walle
2012-02-01 8:45 ` Michael Olbrich
2012-02-02 20:23 ` Bernhard Walle [this message]
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=1328214228-7571-1-git-send-email-bernhard@bwalle.de \
--to=bernhard@bwalle.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