diff options
Diffstat (limited to 'debian/patches/mk-sort-object-files-when-building-deps-lists.patch')
-rw-r--r-- | debian/patches/mk-sort-object-files-when-building-deps-lists.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/debian/patches/mk-sort-object-files-when-building-deps-lists.patch b/debian/patches/mk-sort-object-files-when-building-deps-lists.patch new file mode 100644 index 00000000..d727954d --- /dev/null +++ b/debian/patches/mk-sort-object-files-when-building-deps-lists.patch @@ -0,0 +1,64 @@ +Description: mk: sort object files when building deps lists + +In order to achieve reproducible builds, always use the same +order when listing object files to build dependencies lists. + +Origin: http://dpdk.org/dev/patchwork/patch/25680/ +Forwarded: yes +Author: Luca Boccassi <luca.boccassi@gmail.com> +Last-Update: 2017-06-24 +--- + 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 bcaf1b382..54134dea4 100644 +--- a/mk/rte.app.mk ++++ b/mk/rte.app.mk +@@ -263,8 +263,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 5cb4909cb..f58173c31 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 87ccf0ba4..4e680bc03 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.11.0 + |