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

diff --git a/apt-inst/makefile b/apt-inst/makefile
index 2883cbcb0891b24fb11b6e10218db8151ae5cf1d..5601cd9e68f8023ada95a08aafad7986f72b36cb 100644 (file)
--- 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
 
 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)
 
 include $(LIBRARY_H)

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 9236f81fbc4cf6cbef0448a6101b6a26d391c2fa..e3e6e202e117de57d8b4c8fb33041e68db463c01 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -31,7 +31,7 @@ SLIBS+= -llz4
 endif
 APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
 
 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)
 
 include $(LIBRARY_H)

diff --git a/apt-private/makefile b/apt-private/makefile
index 9a3fbdb2998f534d1fc94b8d0fb1d5507094f071..1934db160197998f961d5329c7e555de9f6fffa1 100644 (file)
--- a/apt-private/makefile
+++ b/apt-private/makefile
@@ -15,7 +15,7 @@ MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 
 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)
 
 include $(LIBRARY_H)