diff options
author | smitsohu <smitsohu@gmail.com> | 2018-03-24 17:12:01 +0100 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2018-03-24 17:12:01 +0100 |
commit | ba1fc01cb77573a205e88d4d5c786398384382c7 (patch) | |
tree | 76e1eca9fdd598b8f9fa3d288727c22f0e83961a /configure | |
parent | add basic akonadi integration (diff) | |
parent | Fixup gnome-recipes and add it to firecfg (diff) | |
download | firejail-ba1fc01cb77573a205e88d4d5c786398384382c7.tar.gz firejail-ba1fc01cb77573a205e88d4d5c786398384382c7.tar.zst firejail-ba1fc01cb77573a205e88d4d5c786398384382c7.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 34 |
1 files changed, 30 insertions, 4 deletions
@@ -646,6 +646,7 @@ EGREP | |||
646 | GREP | 646 | GREP |
647 | CPP | 647 | CPP |
648 | HAVE_APPARMOR | 648 | HAVE_APPARMOR |
649 | EXTRA_CFLAGS | ||
649 | RANLIB | 650 | RANLIB |
650 | INSTALL_DATA | 651 | INSTALL_DATA |
651 | INSTALL_SCRIPT | 652 | INSTALL_SCRIPT |
@@ -2099,7 +2100,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
2099 | 2100 | ||
2100 | #AC_CONFIG_HEADERS([config.h]) | 2101 | #AC_CONFIG_HEADERS([config.h]) |
2101 | 2102 | ||
2102 | |||
2103 | ac_ext=c | 2103 | ac_ext=c |
2104 | ac_cpp='$CPP $CPPFLAGS' | 2104 | ac_cpp='$CPP $CPPFLAGS' |
2105 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 2105 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -3105,6 +3105,31 @@ else | |||
3105 | fi | 3105 | fi |
3106 | 3106 | ||
3107 | 3107 | ||
3108 | HAVE_SPECTRE="no" | ||
3109 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Spectre mitigation support in gcc compiler" >&5 | ||
3110 | $as_echo_n "checking for Spectre mitigation support in gcc compiler... " >&6; } | ||
3111 | if test "$CC" = "gcc"; then : | ||
3112 | |||
3113 | HAVE_SPECTRE="yes" | ||
3114 | $CC -mindirect-branch=thunk -c dummy.c || HAVE_SPECTRE="no" | ||
3115 | rm -f dummy.o | ||
3116 | |||
3117 | fi | ||
3118 | if test "$HAVE_SPECTRE" = "yes"; then : | ||
3119 | |||
3120 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3121 | $as_echo "yes" >&6; } | ||
3122 | EXTRA_CFLAGS+=" -mindirect-branch=thunk " | ||
3123 | |||
3124 | fi | ||
3125 | if test "$HAVE_SPECTRE" = "no"; then : | ||
3126 | |||
3127 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ... not available" >&5 | ||
3128 | $as_echo "... not available" >&6; } | ||
3129 | |||
3130 | fi | ||
3131 | |||
3132 | |||
3108 | HAVE_APPARMOR="" | 3133 | HAVE_APPARMOR="" |
3109 | # Check whether --enable-apparmor was given. | 3134 | # Check whether --enable-apparmor was given. |
3110 | if test "${enable_apparmor+set}" = set; then : | 3135 | if test "${enable_apparmor+set}" = set; then : |
@@ -3119,7 +3144,6 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3119 | fi | 3144 | fi |
3120 | 3145 | ||
3121 | 3146 | ||
3122 | |||
3123 | ac_ext=c | 3147 | ac_ext=c |
3124 | ac_cpp='$CPP $CPPFLAGS' | 3148 | ac_cpp='$CPP $CPPFLAGS' |
3125 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 3149 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -3531,7 +3555,7 @@ fi | |||
3531 | fi | 3555 | fi |
3532 | if test "x$enable_apparmor" = "xyes"; then : | 3556 | if test "x$enable_apparmor" = "xyes"; then : |
3533 | 3557 | ||
3534 | EXTRA_LDFLAGS+="-lapparmor " | 3558 | EXTRA_LDFLAGS+=" -lapparmor " |
3535 | 3559 | ||
3536 | fi | 3560 | fi |
3537 | 3561 | ||
@@ -3725,7 +3749,7 @@ fi | |||
3725 | if test "x$enable_gcov" = "xyes"; then : | 3749 | if test "x$enable_gcov" = "xyes"; then : |
3726 | 3750 | ||
3727 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 3751 | HAVE_GCOV="--coverage -DHAVE_GCOV " |
3728 | EXTRA_LDFLAGS+="-lgcov --coverage " | 3752 | EXTRA_LDFLAGS+=" -lgcov --coverage " |
3729 | 3753 | ||
3730 | 3754 | ||
3731 | fi | 3755 | fi |
@@ -5024,7 +5048,9 @@ echo " file transfer support: $HAVE_FILE_TRANSFER" | |||
5024 | echo " overlayfs support: $HAVE_OVERLAYFS" | 5048 | echo " overlayfs support: $HAVE_OVERLAYFS" |
5025 | echo " git install support: $HAVE_GIT_INSTALL" | 5049 | echo " git install support: $HAVE_GIT_INSTALL" |
5026 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 5050 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
5051 | echo " Spectre compiler patch: $HAVE_SPECTRE" | ||
5027 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 5052 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
5053 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" | ||
5028 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 5054 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
5029 | echo " Gcov instrumentation: $HAVE_GCOV" | 5055 | echo " Gcov instrumentation: $HAVE_GCOV" |
5030 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | 5056 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" |