From patchwork Tue Sep 3 08:45:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 272175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 96FA72C00A9 for ; Tue, 3 Sep 2013 18:46:45 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B65308A9BB; Tue, 3 Sep 2013 08:46:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 93qN6hYW0H3W; Tue, 3 Sep 2013 08:46:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2AE038A882; Tue, 3 Sep 2013 08:46:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E29081BF9D4 for ; Tue, 3 Sep 2013 08:46:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D9B7B8A882 for ; Tue, 3 Sep 2013 08:46:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 05hTZfTdvkH9 for ; Tue, 3 Sep 2013 08:46:40 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from sysmic.org (unknown [88.191.79.235]) by whitealder.osuosl.org (Postfix) with ESMTPS id E8C098A863 for ; Tue, 3 Sep 2013 08:46:39 +0000 (UTC) Received: from sysmic.org (sysmic.org [88.191.79.235]) (using TLSv1.1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: jezz) by sysmic.org (Postfix) with ESMTPSA id 6E56A6219F; Tue, 3 Sep 2013 10:46:38 +0200 (CEST) From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= To: buildroot@busybox.net Date: Tue, 3 Sep 2013 10:45:41 +0200 Message-Id: <1378197941-30752-1-git-send-email-jezz@sysmic.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <52257E0D.3000100@mind.be> References: <52257E0D.3000100@mind.be> MIME-Version: 1.0 Cc: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Subject: [Buildroot] [PATCH v2] Fix build reproducibility in Make 3.82 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Make 3.82 do not sort anymore 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 Acked-by: Arnout Vandecappelle (Essensium/Mind) --- V2: Add forgotten file support/dependencies/dependencies.mk. Even if it does not make difference for the build result, I prefer to be consistent. Makefile | 2 +- boot/common.mk | 2 +- docs/manual/manual.mk | 2 +- fs/common.mk | 2 +- linux/linux.mk | 2 +- package/efl/efl.mk | 2 +- package/freescale-imx/freescale-imx.mk | 2 +- package/gcc/gcc.mk | 2 +- package/gtk2-themes/gtk2-themes.mk | 2 +- package/matchbox/matchbox.mk | 2 +- package/opengl/opengl.mk | 2 +- package/qt5/qt5.mk | 2 +- package/x11r7/x11r7.mk | 2 +- support/dependencies/dependencies.mk | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 09faeba..f547af5 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 b315fe8..3021e51 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 4906bc8..bcbedad 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 36da2dd..4dab7ea 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 025fd51..8508a54 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 f284c93..1de68cf 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 9f63ce3..c8f99b6 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 cd6efed..66af425 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -215,4 +215,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 6f31c6d..fc66698 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 abda915..fff4add 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 68df3b1..abf96d5 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 9e71c83..fce0ca3 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 ea0363f..85ecbc5 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 4a220e0..149b8e5 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