godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-08 02:09:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix makefile include order by using sort/wildcard.

Browse Source 
The 'include' directive in GNU make supports wildcards, but their
expansion has no defined sort order (GLOB_NOSORT is passed to glob()).
Usually this doesn't matter. However, there is at least one case where
it does make a difference: toolchain/*/*.mk includes both the
definitions of the external toolchain packages and
pkg-toolchain-external.mk, but pkg-toolchain-external.mk must be
included first.

For predictability, use ordered 'include $(sort $(wildcard ...))'
instead of unordered direct 'include */*.mk' everywhere.

Fixes [1] reported by Petr Vorel:

  make: *** No rule to make target 'toolchain-external-custom', needed by '.../build/toolchain-external/.stamp_configured'.  Stop.

[1] http://lists.busybox.net/pipermail/buildroot/2017-November/206969.html

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
[Arnout: also sort the one remaining include, of the external docs]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

(cherry picked from commit b9d2d4cb4e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Seiderer
2017-11-21 20:13:30 +01:00
committed by Peter Korsgaard
parent 3f8e8050d6
commit 8bb4b9c8df
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/gstreamer/gstreamer.mk
View File

@@ -1 +1 @@
include package/gstreamer/*/*.mk
include $(sort $(wildcard package/gstreamer/*/*.mk))

2
package/gstreamer1/gstreamer1.mk
View File

@@ -1 +1 @@
include package/gstreamer1/*/*.mk
include $(sort $(wildcard package/gstreamer1/*/*.mk))