From ffe2fe3a95abd89e60618d007951f2d01a7771e3 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 12 Oct 2017 14:15:53 +0100 Subject: [PATCH] mk: sort libraries in dependency lists In order to achieve reproducible builds, always use the same order when listing object files to build dependencies lists. Signed-off-by: Luca Boccassi --- mk/rte.app.mk | 4 ++-- mk/rte.hostapp.mk | 4 ++-- mk/rte.shared.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 384dc06b2c..83e042e416 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -290,8 +290,8 @@ LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIB # list of found libraries files (useful for deps). If not found, the # library is silently ignored and dep won't be checked -LDLIBS_FILES := $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES)))) +LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ + $(addprefix $(dir)/,$(LDLIBS_NAMES))))) # # Compile executable file if needed diff --git a/mk/rte.hostapp.mk b/mk/rte.hostapp.mk index 5cb4909cb6..f58173c319 100644 --- a/mk/rte.hostapp.mk +++ b/mk/rte.hostapp.mk @@ -69,9 +69,9 @@ O_TO_EXE_DO = @set -e; \ -include .$(HOSTAPP).cmd # list of .a files that are linked to this application -LDLIBS_FILES := $(wildcard \ +LDLIBS_FILES := $(sort $(wildcard \ $(addprefix $(RTE_OUTPUT)/lib/, \ - $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))))) + $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS)))))) # # Compile executable file if needed diff --git a/mk/rte.shared.mk b/mk/rte.shared.mk index 87ccf0ba4a..4e680bc03f 100644 --- a/mk/rte.shared.mk +++ b/mk/rte.shared.mk @@ -85,8 +85,8 @@ LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIB # list of found libraries files (useful for deps). If not found, the # library is silently ignored and dep won't be checked -LDLIBS_FILES := $(wildcard $(foreach dir,$(LDLIBS_PATH),\ - $(addprefix $(dir)/,$(LDLIBS_NAMES)))) +LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\ + $(addprefix $(dir)/,$(LDLIBS_NAMES))))) # # Archive objects in .so file if needed -- 2.20.1