diff options
-rwxr-xr-x | configure | 16 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/firejail/Makefile.in | 3 | ||||
-rw-r--r-- | src/firemon/Makefile.in | 3 | ||||
-rw-r--r-- | src/ftee/Makefile.in | 3 | ||||
-rw-r--r-- | src/libtrace/Makefile.in | 2 |
6 files changed, 31 insertions, 4 deletions
@@ -628,6 +628,7 @@ HAVE_SECCOMP_H | |||
628 | EGREP | 628 | EGREP |
629 | GREP | 629 | GREP |
630 | CPP | 630 | CPP |
631 | HAVE_FATAL_WARNINGS | ||
631 | HAVE_BIND | 632 | HAVE_BIND |
632 | HAVE_CHROOT | 633 | HAVE_CHROOT |
633 | HAVE_SECCOMP | 634 | HAVE_SECCOMP |
@@ -686,6 +687,7 @@ enable_option_checking | |||
686 | enable_seccomp | 687 | enable_seccomp |
687 | enable_chroot | 688 | enable_chroot |
688 | enable_bind | 689 | enable_bind |
690 | enable_fatal_warnings | ||
689 | ' | 691 | ' |
690 | ac_precious_vars='build_alias | 692 | ac_precious_vars='build_alias |
691 | host_alias | 693 | host_alias |
@@ -1308,6 +1310,7 @@ Optional Features: | |||
1308 | --disable-seccomp Disable seccomp | 1310 | --disable-seccomp Disable seccomp |
1309 | --disable-chroot Disable chroot | 1311 | --disable-chroot Disable chroot |
1310 | --disable-bind Disable bind | 1312 | --disable-bind Disable bind |
1313 | --enable-fatal-warnings -W -Wall -Werror | ||
1311 | 1314 | ||
1312 | Some influential environment variables: | 1315 | Some influential environment variables: |
1313 | CC C compiler command | 1316 | CC C compiler command |
@@ -3084,6 +3087,18 @@ if test "x$enable_bind" != "xno"; then : | |||
3084 | 3087 | ||
3085 | fi | 3088 | fi |
3086 | 3089 | ||
3090 | HAVE_FATAL_WARNINGS="" | ||
3091 | # Check whether --enable-fatal_warnings was given. | ||
3092 | if test "${enable_fatal_warnings+set}" = set; then : | ||
3093 | enableval=$enable_fatal_warnings; | ||
3094 | fi | ||
3095 | |||
3096 | if test "x$enable_fatal_warnings" = "xyes"; then : | ||
3097 | |||
3098 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" | ||
3099 | |||
3100 | |||
3101 | fi | ||
3087 | 3102 | ||
3088 | # checking pthread library | 3103 | # checking pthread library |
3089 | 3104 | ||
@@ -4720,4 +4735,5 @@ echo " seccomp: $HAVE_SECCOMP" | |||
4720 | echo " <linux/seccomp.h>: $HAVE_SECCOMP_H" | 4735 | echo " <linux/seccomp.h>: $HAVE_SECCOMP_H" |
4721 | echo " chroot: $HAVE_CHROOT" | 4736 | echo " chroot: $HAVE_CHROOT" |
4722 | echo " bind: $HAVE_BIND" | 4737 | echo " bind: $HAVE_BIND" |
4738 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | ||
4723 | echo | 4739 | echo |
diff --git a/configure.ac b/configure.ac index 8c5a65397..3fa0c933b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -33,6 +33,13 @@ AS_IF([test "x$enable_bind" != "xno"], [ | |||
33 | AC_SUBST(HAVE_BIND) | 33 | AC_SUBST(HAVE_BIND) |
34 | ]) | 34 | ]) |
35 | 35 | ||
36 | HAVE_FATAL_WARNINGS="" | ||
37 | AC_ARG_ENABLE([fatal_warnings], | ||
38 | AS_HELP_STRING([--enable-fatal-warnings], [-W -Wall -Werror])) | ||
39 | AS_IF([test "x$enable_fatal_warnings" = "xyes"], [ | ||
40 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" | ||
41 | AC_SUBST(HAVE_FATAL_WARNINGS) | ||
42 | ]) | ||
36 | 43 | ||
37 | # checking pthread library | 44 | # checking pthread library |
38 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 45 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
@@ -49,4 +56,5 @@ echo " seccomp: $HAVE_SECCOMP" | |||
49 | echo " <linux/seccomp.h>: $HAVE_SECCOMP_H" | 56 | echo " <linux/seccomp.h>: $HAVE_SECCOMP_H" |
50 | echo " chroot: $HAVE_CHROOT" | 57 | echo " chroot: $HAVE_CHROOT" |
51 | echo " bind: $HAVE_BIND" | 58 | echo " bind: $HAVE_BIND" |
59 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | ||
52 | echo | 60 | echo |
diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile.in index fca86be4d..f2419c0cd 100644 --- a/src/firejail/Makefile.in +++ b/src/firejail/Makefile.in | |||
@@ -7,12 +7,13 @@ HAVE_SECCOMP_H=@HAVE_SECCOMP_H@ | |||
7 | HAVE_SECCOMP=@HAVE_SECCOMP@ | 7 | HAVE_SECCOMP=@HAVE_SECCOMP@ |
8 | HAVE_CHROOT=@HAVE_CHROOT@ | 8 | HAVE_CHROOT=@HAVE_CHROOT@ |
9 | HAVE_BIND=@HAVE_BIND@ | 9 | HAVE_BIND=@HAVE_BIND@ |
10 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
10 | 11 | ||
11 | H_FILE_LIST = $(wildcard *.[h]) | 12 | H_FILE_LIST = $(wildcard *.[h]) |
12 | C_FILE_LIST = $(wildcard *.c) | 13 | C_FILE_LIST = $(wildcard *.c) |
13 | OBJS = $(C_FILE_LIST:.c=.o) | 14 | OBJS = $(C_FILE_LIST:.c=.o) |
14 | BINOBJS = $(foreach file, $(OBJS), $file) | 15 | BINOBJS = $(foreach file, $(OBJS), $file) |
15 | CFLAGS += -ggdb -W -Wall -Werror -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(PREFIX)"' $(HAVE_SECCOMP) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_BIND) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 16 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(PREFIX)"' $(HAVE_SECCOMP) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_BIND) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security |
16 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 17 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
17 | 18 | ||
18 | %.o : %.c $(H_FILE_LIST) | 19 | %.o : %.c $(H_FILE_LIST) |
diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile.in index 56c25ee18..39033fa71 100644 --- a/src/firemon/Makefile.in +++ b/src/firemon/Makefile.in | |||
@@ -3,12 +3,13 @@ all: firemon | |||
3 | PREFIX=@prefix@ | 3 | PREFIX=@prefix@ |
4 | VERSION=@PACKAGE_VERSION@ | 4 | VERSION=@PACKAGE_VERSION@ |
5 | NAME=@PACKAGE_NAME@ | 5 | NAME=@PACKAGE_NAME@ |
6 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
6 | 7 | ||
7 | H_FILE_LIST = $(wildcard *.[h]) | 8 | H_FILE_LIST = $(wildcard *.[h]) |
8 | C_FILE_LIST = $(wildcard *.c) | 9 | C_FILE_LIST = $(wildcard *.c) |
9 | OBJS = $(C_FILE_LIST:.c=.o) | 10 | OBJS = $(C_FILE_LIST:.c=.o) |
10 | BINOBJS = $(foreach file, $(OBJS), $file) | 11 | BINOBJS = $(foreach file, $(OBJS), $file) |
11 | CFLAGS += -ggdb -W -Wall -Werror -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security |
12 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now | 13 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now |
13 | 14 | ||
14 | %.o : %.c $(H_FILE_LIST) | 15 | %.o : %.c $(H_FILE_LIST) |
diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile.in index 8fe4a4c4c..a17c33988 100644 --- a/src/ftee/Makefile.in +++ b/src/ftee/Makefile.in | |||
@@ -3,12 +3,13 @@ all: ftee | |||
3 | PREFIX=@prefix@ | 3 | PREFIX=@prefix@ |
4 | VERSION=@PACKAGE_VERSION@ | 4 | VERSION=@PACKAGE_VERSION@ |
5 | NAME=@PACKAGE_NAME@ | 5 | NAME=@PACKAGE_NAME@ |
6 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
6 | 7 | ||
7 | H_FILE_LIST = $(wildcard *.[h]) | 8 | H_FILE_LIST = $(wildcard *.[h]) |
8 | C_FILE_LIST = $(wildcard *.c) | 9 | C_FILE_LIST = $(wildcard *.c) |
9 | OBJS = $(C_FILE_LIST:.c=.o) | 10 | OBJS = $(C_FILE_LIST:.c=.o) |
10 | BINOBJS = $(foreach file, $(OBJS), $file) | 11 | BINOBJS = $(foreach file, $(OBJS), $file) |
11 | CFLAGS += -ggdb -W -Wall -Werror -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(PREFIX)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security | 12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -DPREFIX='"$(PREFIX)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security |
12 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread | 13 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread |
13 | 14 | ||
14 | %.o : %.c $(H_FILE_LIST) | 15 | %.o : %.c $(H_FILE_LIST) |
diff --git a/src/libtrace/Makefile.in b/src/libtrace/Makefile.in index ca152cef2..a7d768bf4 100644 --- a/src/libtrace/Makefile.in +++ b/src/libtrace/Makefile.in | |||
@@ -6,7 +6,7 @@ H_FILE_LIST = $(wildcard *.[h]) | |||
6 | C_FILE_LIST = $(wildcard *.c) | 6 | C_FILE_LIST = $(wildcard *.c) |
7 | OBJS = $(C_FILE_LIST:.c=.o) | 7 | OBJS = $(C_FILE_LIST:.c=.o) |
8 | BINOBJS = $(foreach file, $(OBJS), $file) | 8 | BINOBJS = $(foreach file, $(OBJS), $file) |
9 | CFLAGS += -ggdb -W -Wall -Werror -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security | 9 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security |
10 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now | 10 | LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now |
11 | 11 | ||
12 | all: libtrace.so | 12 | all: libtrace.so |