This project is archived. Its data is read-only.

Commit 741cbccb authored Sep 03, 2013 by Jérôme Pouiller Committed by Peter Korsgaard Sep 06, 2013

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>

parent 055f1c02

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

boot/common.mk

+1 −1

Original line number	Diff line number	Diff line
		include boot//.mk
		include $(sort $(wildcard boot//.mk))

docs/manual/manual.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

fs/common.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,4 +94,4 @@ define ROOTFS_TARGET
		$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
		endef

		include fs//.mk
		include $(sort $(wildcard fs//.mk))

linux/linux.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))