Re: [ptxdist] [PATCH] make 3.82: Don't rely on sorted wildcard expansion

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Sun, Jan 29, 2012 at 08:15:49PM +0100, Bernhard Walle wrote:
> 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.

This is not correct. It will sort all post files and does not honor the
order of PTXDIST_PATH_POSTRULES. This should probably be something like
this (untested):

$(foreach dir, $(call reverse,$(subst :,$(space),$(PTXDIST_PATH_POSTRULES))), include (sort $(wildcard $(dir)/*.make)))

and the same for PTXDIST_PATH_PRERULES.

Michael

> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  rules/other/Toplevel.make |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make
> index 35c2c27..0cb7e82 100644
> --- a/rules/other/Toplevel.make
> +++ b/rules/other/Toplevel.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 $(sort $(wildcard $(addsuffix /*.make,$(call reverse,$(subst :,$(space),$(PTXDIST_PATH_POSTRULES))))))
>  # 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
> 

-- 
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