Fix build reproducibility in Make 3.82

Make 3.82 no longer sort the result of wildcards (see
http://comments.gmane.org/gmane.comp.gnu.make.bugs/4260). This may break
build reproducibility.

This patch sort results of wildcards to ensure reproducibility.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Jérôme Pouiller 2013-09-03 10:45:41 +02:00 committed by Peter Korsgaard
parent 055f1c02d3
commit 741cbccb74
14 changed files with 14 additions and 14 deletions

View File

@ -333,7 +333,7 @@ ifneq ($(PACKAGE_OVERRIDE_FILE),)
-include $(PACKAGE_OVERRIDE_FILE)
endif
include package/*/*.mk
include $(sort $(wildcard package/*/*.mk))
include boot/common.mk
include linux/linux.mk

View File

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

View File

@ -53,5 +53,5 @@ $(1)-clean:
.PHONY: $(1) $(1)-clean manual-update-lists
endef
MANUAL_SOURCES = $(wildcard docs/manual/*.txt) $(wildcard docs/images/*)
MANUAL_SOURCES = $(sort $(wildcard docs/manual/*.txt) $(wildcard docs/images/*))
$(eval $(call GENDOC,manual))

View File

@ -94,4 +94,4 @@ define ROOTFS_TARGET
$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
endef
include fs/*/*.mk
include $(sort $(wildcard fs/*/*.mk))

View File

@ -281,7 +281,7 @@ define LINUX_INSTALL_TARGET_CMDS
$(LINUX_INSTALL_HOST_TOOLS)
endef
include linux/linux-ext-*.mk
include $(sort $(wildcard linux/linux-ext-*.mk))
$(eval $(generic-package))

View File

@ -1,3 +1,3 @@
EFL_VERSION = 1.7.7
include package/efl/*/*.mk
include $(sort $(wildcard package/efl/*/*.mk))

View File

@ -9,5 +9,5 @@ FREESCALE_IMX_VERSION = 1.1.0
# No official download site from freescale, just this mirror
FREESCALE_IMX_MIRROR_SITE = http://download.ossystems.com.br/bsp/freescale/source
include package/freescale-imx/*/*.mk
include $(sort $(wildcard package/freescale-imx/*/*.mk))

View File

@ -220,4 +220,4 @@ HOST_GCC_COMMON_CONF_OPT += \
--with-long-double-128
endif
include package/gcc/*/*.mk
include $(sort $(wildcard package/gcc/*/*.mk))

View File

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

View File

@ -1,4 +1,4 @@
ifeq ($(BR2_PACKAGE_MATCHBOX),y)
include package/matchbox/*/*.mk
include $(sort $(wildcard package/matchbox/*/*.mk))
TARGETS+=matchbox-lib matchbox-wm
endif

View File

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

View File

@ -1,6 +1,6 @@
QT5_VERSION = 5.0.2
QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/
include package/qt5/*/*.mk
include $(sort $(wildcard package/qt5/*/*.mk))
define QT5_LA_PRL_FILES_FIXUP
for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \

View File

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

View File

@ -14,7 +14,7 @@ DEPENDENCIES_HOST_PREREQ :=
define suitable-host-package
$(shell support/dependencies/check-host-$(1).sh $(2))
endef
-include support/dependencies/check-host-*.mk
-include $(sort $(wildcard support/dependencies/check-host-*.mk))
ifeq ($(BR2_STRIP_sstrip),y)
DEPENDENCIES_HOST_PREREQ+=host-sstrip