summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2016-01-09 10:45:34 +0000
committerJulian Andres Klode <jak@debian.org>2016-01-11 17:46:41 +0100
commit831ea74cddf8568b8648edddb394fdd3d1ba7b8e (patch)
treedce40f839154245afc959eb035926c45cde3f3fa
parentace5a062fc5390e636b09c5684bfbeae755cf437 (diff)
Sort the list of sources to be built and linked
Fix reproducibility issue due to readdir() order by sorting the list of sources to be built and linked. [jak@debian.org: Added summary and fixed typo] Closes: #810509
-rw-r--r--apt-inst/makefile4
-rw-r--r--apt-pkg/makefile4
-rw-r--r--apt-private/makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/apt-inst/makefile b/apt-inst/makefile
index 2883cbcb0..5601cd9e6 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -20,7 +20,7 @@ SLIBS=$(PTHREADLIB) -lapt-pkg
APT_DOMAIN:=libapt-inst$(MAJOR)
LIBRARYDEPENDS=$(LIB)/libapt-pkg.so
-SOURCE = $(wildcard *.cc */*.cc)
-HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))
+SOURCE = $(sort $(wildcard *.cc */*.cc))
+HEADERS = $(addprefix apt-pkg/,$(notdir $(sort $(wildcard *.h */*.h))))
include $(LIBRARY_H)
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 9236f81fb..e3e6e202e 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -31,7 +31,7 @@ SLIBS+= -llz4
endif
APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
-SOURCE = $(wildcard *.cc */*.cc)
-HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))
+SOURCE = $(sort $(wildcard *.cc */*.cc))
+HEADERS = $(addprefix apt-pkg/,$(notdir $(sort $(wildcard *.h */*.h))))
include $(LIBRARY_H)
diff --git a/apt-private/makefile b/apt-private/makefile
index 9a3fbdb29..1934db160 100644
--- a/apt-private/makefile
+++ b/apt-private/makefile
@@ -15,7 +15,7 @@ MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg
CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-SOURCE = $(wildcard *.cc)
-HEADERS = $(addprefix apt-private/,$(wildcard *.h))
+SOURCE = $(sort $(wildcard *.cc))
+HEADERS = $(addprefix apt-private/,$(sort $(wildcard *.h)))
include $(LIBRARY_H)