From 991a20950927d1574b384bd3f9313653fe5897cd Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Wed, 16 Dec 2015 23:12:05 +0100 Subject: Sort file lists to make build reproducible --- src/firejail/Makefile.in | 4 ++-- src/firemon/Makefile.in | 4 ++-- src/ftee/Makefile.in | 4 ++-- src/lib/Makefile.in | 4 ++-- src/libtrace/Makefile.in | 4 ++-- src/libtracelog/Makefile.in | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile.in index c2663f1a9..87cda9ab2 100644 --- a/src/firejail/Makefile.in +++ b/src/firejail/Makefile.in @@ -14,8 +14,8 @@ HAVE_BIND=@HAVE_BIND@ HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ -H_FILE_LIST = $(wildcard *.[h]) -C_FILE_LIST = $(wildcard *.c) +H_FILE_LIST = $(sort $(wildcard *.[h])) +C_FILE_LIST = $(sort $(wildcard *.c)) OBJS = $(C_FILE_LIST:.c=.o) BINOBJS = $(foreach file, $(OBJS), $file) CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_SECCOMP) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_BIND) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile.in index 39033fa71..21888d354 100644 --- a/src/firemon/Makefile.in +++ b/src/firemon/Makefile.in @@ -5,8 +5,8 @@ VERSION=@PACKAGE_VERSION@ NAME=@PACKAGE_NAME@ HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ -H_FILE_LIST = $(wildcard *.[h]) -C_FILE_LIST = $(wildcard *.c) +H_FILE_LIST = $(sort $(wildcard *.[h])) +C_FILE_LIST = $(sort $(wildcard *.c)) OBJS = $(C_FILE_LIST:.c=.o) BINOBJS = $(foreach file, $(OBJS), $file) CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile.in index a17c33988..be159225f 100644 --- a/src/ftee/Makefile.in +++ b/src/ftee/Makefile.in @@ -5,8 +5,8 @@ VERSION=@PACKAGE_VERSION@ NAME=@PACKAGE_NAME@ HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ -H_FILE_LIST = $(wildcard *.[h]) -C_FILE_LIST = $(wildcard *.c) +H_FILE_LIST = $(sort $(wildcard *.[h])) +C_FILE_LIST = $(sort $(wildcard *.c)) OBJS = $(C_FILE_LIST:.c=.o) BINOBJS = $(foreach file, $(OBJS), $file) CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(PREFIX)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 0b96ad2f2..71f96bab1 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -3,8 +3,8 @@ VERSION=@PACKAGE_VERSION@ NAME=@PACKAGE_NAME@ HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ -H_FILE_LIST = $(wildcard *.[h]) -C_FILE_LIST = $(wildcard *.c) +H_FILE_LIST = $(sort $(wildcard *.[h])) +C_FILE_LIST = $(sort $(wildcard *.c)) OBJS = $(C_FILE_LIST:.c=.o) BINOBJS = $(foreach file, $(OBJS), $file) CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security diff --git a/src/libtrace/Makefile.in b/src/libtrace/Makefile.in index 6917127b0..9de0b40eb 100644 --- a/src/libtrace/Makefile.in +++ b/src/libtrace/Makefile.in @@ -3,8 +3,8 @@ VERSION=@PACKAGE_VERSION@ NAME=@PACKAGE_NAME@ HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ -H_FILE_LIST = $(wildcard *.[h]) -C_FILE_LIST = $(wildcard *.c) +H_FILE_LIST = $(sort $(wildcard *.[h])) +C_FILE_LIST = $(sort $(wildcard *.c)) OBJS = $(C_FILE_LIST:.c=.o) BINOBJS = $(foreach file, $(OBJS), $file) CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security diff --git a/src/libtracelog/Makefile.in b/src/libtracelog/Makefile.in index 8f6c161ab..5c199d338 100644 --- a/src/libtracelog/Makefile.in +++ b/src/libtracelog/Makefile.in @@ -3,8 +3,8 @@ VERSION=@PACKAGE_VERSION@ NAME=@PACKAGE_NAME@ HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ -H_FILE_LIST = $(wildcard *.[h]) -C_FILE_LIST = $(wildcard *.c) +H_FILE_LIST = $(sort $(wildcard *.[h])) +C_FILE_LIST = $(sort $(wildcard *.c)) OBJS = $(C_FILE_LIST:.c=.o) BINOBJS = $(foreach file, $(OBJS), $file) CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security -- cgit v1.2.3-54-g00ecf