diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2012-02-02 21:23:48 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-02-03 00:02:51 +0100 |
| commit | 3e3dc870e08b18fdd20547a2d3d340db17035707 (patch) | |
| tree | f1678b6017a7bdcf57767b9f3feb0e413e071fe4 | |
| parent | 2daba725f6da5d27d4fe3805a81505c395eb6594 (diff) | |
| download | ptxdist-3e3dc870e08b18fdd20547a2d3d340db17035707.tar.gz ptxdist-3e3dc870e08b18fdd20547a2d3d340db17035707.tar.xz | |
make 3.82: Don't rely on sorted wildcard expansion
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>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | 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 35c2c272d..85ad515fc 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) |