aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-03-20 07:28:50 +0000
committerLibravatar GitHub <noreply@github.com>2024-03-20 07:28:50 +0000
commit0da23da653c273874a3efa8b57db264ab2dadfea (patch)
tree4cbb94283e404f9b538628f5c6fceb2e07be0884 /configure
parentRename etc/session-desktop.profile to etc/profile-m-z/session-desktop.profile (diff)
downloadfirejail-0da23da653c273874a3efa8b57db264ab2dadfea.tar.gz
firejail-0da23da653c273874a3efa8b57db264ab2dadfea.tar.zst
firejail-0da23da653c273874a3efa8b57db264ab2dadfea.zip
build: fix "warning: "_FORTIFY_SOURCE" redefined" (#6283)
The warning is being produced on Arch since pacman 6.1, which changed `-D_FORTIFY_SOURCE=2` to `-D_FORTIFY_SOURCE=3` in CFLAGS in makepkg.conf: $ pacman -Q gcc pacman gcc 13.2.1-5 pacman 6.1.0-3 $ makepkg [...] make -C src/lib gcc [...] -D_FORTIFY_SOURCE=2 [...] -Wp,-D_FORTIFY_SOURCE=3 [...] -c ../../src/lib/common.c -o ../../src/lib/common.o <command-line>: warning: "_FORTIFY_SOURCE" redefined <command-line>: note: this is the location of the previous definition To fix this, only add `-D_FORTIFY_SOURCE` to EXTRA_CFLAGS if it does not cause any warnings with CFLAGS and CPPFLAGS during compilation. The effect remains the same: The build system still defines the macro by default (if there are no warnings) and the user/distribution can still override it through CFLAGS/CPPFLAGS. Fixes #6282. Reported-by: @glitsj16
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure43
1 files changed, 43 insertions, 0 deletions
diff --git a/configure b/configure
index 61c025a20..348c02cbb 100755
--- a/configure
+++ b/configure
@@ -3506,6 +3506,49 @@ else $as_nop
3506fi 3506fi
3507 3507
3508 3508
3509as_CACHEVAR=`printf "%s\n" "ax_cv_check_cflags_$CFLAGS $CPPFLAGS -Werror_-D_FORTIFY_SOURCE=2" | $as_tr_sh`
3510{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -D_FORTIFY_SOURCE=2" >&5
3511printf %s "checking whether C compiler accepts -D_FORTIFY_SOURCE=2... " >&6; }
3512if eval test \${$as_CACHEVAR+y}
3513then :
3514 printf %s "(cached) " >&6
3515else $as_nop
3516
3517 ax_check_save_flags=$CFLAGS
3518 CFLAGS="$CFLAGS $CFLAGS $CPPFLAGS -Werror -D_FORTIFY_SOURCE=2"
3519 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3520/* end confdefs.h. */
3521
3522int
3523main (void)
3524{
3525
3526 ;
3527 return 0;
3528}
3529_ACEOF
3530if ac_fn_c_try_compile "$LINENO"
3531then :
3532 eval "$as_CACHEVAR=yes"
3533else $as_nop
3534 eval "$as_CACHEVAR=no"
3535fi
3536rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
3537 CFLAGS=$ax_check_save_flags
3538fi
3539eval ac_res=\$$as_CACHEVAR
3540 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3541printf "%s\n" "$ac_res" >&6; }
3542if eval test \"x\$"$as_CACHEVAR"\" = x"yes"
3543then :
3544
3545 EXTRA_CFLAGS="$EXTRA_CFLAGS -D_FORTIFY_SOURCE=2"
3546
3547else $as_nop
3548 :
3549fi
3550
3551
3509HAVE_SPECTRE="no" 3552HAVE_SPECTRE="no"
3510{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mindirect-branch=thunk" >&5 3553{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mindirect-branch=thunk" >&5
3511printf %s "checking whether C compiler accepts -mindirect-branch=thunk... " >&6; } 3554printf %s "checking whether C compiler accepts -mindirect-branch=thunk... " >&6; }