aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jérôme Pouiller <jezz@sysmic.org>2013-09-03 10:45:41 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2013-09-06 23:27:42 +0200
commit741cbccb746b4bda41c5a51bf2d9d8977c902439 (patch)
tree2f9e90e7480238652314c4be181aaf271eb1b95a
parent055f1c02d35068d0b089f3b29ffdd4fb2717bb5c (diff)
downloadbuildroot-741cbccb746b4bda41c5a51bf2d9d8977c902439.tar.gz
buildroot-741cbccb746b4bda41c5a51bf2d9d8977c902439.tar.bz2
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>
-rw-r--r--Makefile2
-rw-r--r--boot/common.mk2
-rw-r--r--docs/manual/manual.mk2
-rw-r--r--fs/common.mk2
-rw-r--r--linux/linux.mk2
-rw-r--r--package/efl/efl.mk2
-rw-r--r--package/freescale-imx/freescale-imx.mk2
-rw-r--r--package/gcc/gcc.mk2
-rw-r--r--package/gtk2-themes/gtk2-themes.mk2
-rw-r--r--package/matchbox/matchbox.mk2
-rw-r--r--package/opengl/opengl.mk2
-rw-r--r--package/qt5/qt5.mk2
-rw-r--r--package/x11r7/x11r7.mk2
-rw-r--r--support/dependencies/dependencies.mk2
14 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 0d7476a4c6..3ca7313942 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/boot/common.mk b/boot/common.mk
index b315fe8393..3021e51949 100644
--- a/boot/common.mk
+++ b/boot/common.mk
@@ -1 +1 @@
-include boot/*/*.mk
+include $(sort $(wildcard boot/*/*.mk))
diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk
index 4906bc871f..bcbedad572 100644
--- a/docs/manual/manual.mk
+++ b/docs/manual/manual.mk
@@ -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))
diff --git a/fs/common.mk b/fs/common.mk
index 36da2dd645..4dab7ea28b 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -94,4 +94,4 @@ define ROOTFS_TARGET
$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
endef
-include fs/*/*.mk
+include $(sort $(wildcard fs/*/*.mk))
diff --git a/linux/linux.mk b/linux/linux.mk
index 025fd51aba..8508a54242 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -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))
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index f284c93be7..1de68cf8fe 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -1,3 +1,3 @@
EFL_VERSION = 1.7.7
-include package/efl/*/*.mk
+include $(sort $(wildcard package/efl/*/*.mk))
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 9f63ce3423..c8f99b6348 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -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))
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index ccba5e1586..6654b51674 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -220,4 +220,4 @@ HOST_GCC_COMMON_CONF_OPT += \
--with-long-double-128
endif
-include package/gcc/*/*.mk
+include $(sort $(wildcard package/gcc/*/*.mk))
diff --git a/package/gtk2-themes/gtk2-themes.mk b/package/gtk2-themes/gtk2-themes.mk
index 6f31c6da98..fc66698a1d 100644
--- a/package/gtk2-themes/gtk2-themes.mk
+++ b/package/gtk2-themes/gtk2-themes.mk
@@ -1 +1 @@
-include package/gtk2-themes/*/*.mk
+include $(sort $(wildcard package/gtk2-themes/*/*.mk))
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index abda91559c..fff4add34b 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -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
diff --git a/package/opengl/opengl.mk b/package/opengl/opengl.mk
index 68df3b171b..abf96d5c70 100644
--- a/package/opengl/opengl.mk
+++ b/package/opengl/opengl.mk
@@ -1 +1 @@
-include package/opengl/*/*.mk
+include $(sort $(wildcard package/opengl/*/*.mk))
diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index 9e71c83ce3..fce0ca3848 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -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 \
diff --git a/package/x11r7/x11r7.mk b/package/x11r7/x11r7.mk
index ea0363f6a0..85ecbc5968 100644
--- a/package/x11r7/x11r7.mk
+++ b/package/x11r7/x11r7.mk
@@ -1 +1 @@
-include package/x11r7/*/*.mk
+include $(sort $(wildcard package/x11r7/*/*.mk))
diff --git a/support/dependencies/dependencies.mk b/support/dependencies/dependencies.mk
index 4a220e0e02..149b8e5dcc 100644
--- a/support/dependencies/dependencies.mk
+++ b/support/dependencies/dependencies.mk
@@ -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