Skip to content

bpo-45723: Improve and simplify more configure.ac checks (GH-29485) #29485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiran merged 6 commits into from
Nov 10, 2021
Merged

bpo-45723: Improve and simplify more configure.ac checks (GH-29485) #29485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6e0fa90
Cache checking for -Wl,--no-as-needed
Nov 9, 2021
35fe25c
Make PY_CHECK_CC_WARNING more efficient
Nov 9, 2021
ad35861
Consolidate AC_MSG_CHECKING and AC_CACHE_VAL
Nov 9, 2021
77f4cad
Nitpick
Nov 9, 2021
de69f18
Use AS_VAR_APPEND in PY_CHECK_CC_WARNING
Nov 9, 2021
79b97e0
Take down one more AC_MSG_RESULT
Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make PY_CHECK_CC_WARNING more efficient
  • Loading branch information
Erlend E. Aasland committed Nov 9, 2021
commit 35fe25c3e6bfdf7790434d2ac4ba36e59d10da9f
112 changes: 63 additions & 49 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7084,15 +7084,16 @@ yes)
CFLAGS_NODIST="$CFLAGS_NODIST -std=c99"



{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can add -Wextra" >&5
$as_echo_n "checking if we can add -Wextra... " >&6; }

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wextra -Werror"
if ${ac_cv_enable_extra_warning+:} false; then :
if ${ac_cv_enable_extra_warning+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wextra -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int
Expand All @@ -7109,10 +7110,11 @@ else
ac_cv_enable_extra_warning=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$py_cflags

fi

CFLAGS=$py_cflags
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_extra_warning" >&5
$as_echo "$ac_cv_enable_extra_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_extra_warning" >&5
$as_echo "$ac_cv_enable_extra_warning" >&6; }

Expand Down Expand Up @@ -7196,15 +7198,16 @@ fi
*icc*) :
ac_cv_disable_unused_result_warning=no


{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can disable $CC unused-result warning" >&5
$as_echo_n "checking if we can disable $CC unused-result warning... " >&6; }

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wunused-result -Werror"
if ${ac_cv_disable_unused_result_warning+:} false; then :
if ${ac_cv_disable_unused_result_warning+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wunused-result -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int
Expand All @@ -7221,10 +7224,11 @@ else
ac_cv_disable_unused_result_warning=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$py_cflags

fi

CFLAGS=$py_cflags
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5
$as_echo "$ac_cv_disable_unused_result_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5
$as_echo "$ac_cv_disable_unused_result_warning" >&6; }

Expand All @@ -7238,15 +7242,16 @@ esac
fi



{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can disable $CC unused-parameter warning" >&5
$as_echo_n "checking if we can disable $CC unused-parameter warning... " >&6; }

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wunused-parameter -Werror"
if ${ac_cv_disable_unused_parameter_warning+:} false; then :
if ${ac_cv_disable_unused_parameter_warning+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wunused-parameter -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int
Expand All @@ -7263,10 +7268,11 @@ else
ac_cv_disable_unused_parameter_warning=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$py_cflags

fi

CFLAGS=$py_cflags
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5
$as_echo "$ac_cv_disable_unused_parameter_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_parameter_warning" >&5
$as_echo "$ac_cv_disable_unused_parameter_warning" >&6; }

Expand All @@ -7276,15 +7282,16 @@ $as_echo "$ac_cv_disable_unused_parameter_warning" >&6; }
fi



{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can disable $CC missing-field-initializers warning" >&5
$as_echo_n "checking if we can disable $CC missing-field-initializers warning... " >&6; }

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wmissing-field-initializers -Werror"
if ${ac_cv_disable_missing_field_initializers_warning+:} false; then :
if ${ac_cv_disable_missing_field_initializers_warning+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wmissing-field-initializers -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int
Expand All @@ -7301,10 +7308,11 @@ else
ac_cv_disable_missing_field_initializers_warning=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$py_cflags

fi

CFLAGS=$py_cflags
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers_warning" >&5
$as_echo "$ac_cv_disable_missing_field_initializers_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_missing_field_initializers_warning" >&5
$as_echo "$ac_cv_disable_missing_field_initializers_warning" >&6; }

Expand All @@ -7314,15 +7322,16 @@ $as_echo "$ac_cv_disable_missing_field_initializers_warning" >&6; }
fi



{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can enable $CC sign-compare warning" >&5
$as_echo_n "checking if we can enable $CC sign-compare warning... " >&6; }

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wsign-compare -Werror"
if ${ac_cv_enable_sign_compare_warning+:} false; then :
if ${ac_cv_enable_sign_compare_warning+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wsign-compare -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int
Expand All @@ -7339,10 +7348,11 @@ else
ac_cv_enable_sign_compare_warning=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$py_cflags

fi

CFLAGS=$py_cflags
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5
$as_echo "$ac_cv_enable_sign_compare_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_sign_compare_warning" >&5
$as_echo "$ac_cv_enable_sign_compare_warning" >&6; }

Expand All @@ -7352,15 +7362,16 @@ $as_echo "$ac_cv_enable_sign_compare_warning" >&6; }
fi



{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can enable $CC unreachable-code warning" >&5
$as_echo_n "checking if we can enable $CC unreachable-code warning... " >&6; }

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wunreachable-code -Werror"
if ${ac_cv_enable_unreachable_code_warning+:} false; then :
if ${ac_cv_enable_unreachable_code_warning+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wunreachable-code -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int
Expand All @@ -7377,10 +7388,11 @@ else
ac_cv_enable_unreachable_code_warning=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$py_cflags

fi

CFLAGS=$py_cflags
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5
$as_echo "$ac_cv_enable_unreachable_code_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_unreachable_code_warning" >&5
$as_echo "$ac_cv_enable_unreachable_code_warning" >&6; }

Expand All @@ -7402,15 +7414,16 @@ $as_echo "$ac_cv_enable_unreachable_code_warning" >&6; }
fi



{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can enable $CC strict-prototypes warning" >&5
$as_echo_n "checking if we can enable $CC strict-prototypes warning... " >&6; }

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wstrict-prototypes -Werror"
if ${ac_cv_enable_strict_prototypes_warning+:} false; then :
if ${ac_cv_enable_strict_prototypes_warning+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext

py_cflags=$CFLAGS
CFLAGS="$CFLAGS -Wstrict-prototypes -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int
Expand All @@ -7427,10 +7440,11 @@ else
ac_cv_enable_strict_prototypes_warning=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$py_cflags

fi

CFLAGS=$py_cflags
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5
$as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_strict_prototypes_warning" >&5
$as_echo "$ac_cv_enable_strict_prototypes_warning" >&6; }

Expand Down
20 changes: 8 additions & 12 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,19 +1643,15 @@ AC_SUBST(UNIVERSAL_ARCH_FLAGS)

dnl PY_CHECK_CC_WARNING(ENABLE, WARNING, [MSG])
AC_DEFUN([PY_CHECK_CC_WARNING], [
AC_MSG_CHECKING(m4_ifblank([$3], [if we can $1 $CC $2 warning], [$3]))
AS_VAR_PUSHDEF([py_var], [ac_cv_$1_]m4_normalize($2)[_warning])
AS_VAR_COPY([py_cflags], [CFLAGS])
AS_VAR_SET([CFLAGS], ["$CFLAGS -W$2 -Werror"])
AC_CACHE_VAL(
[py_var],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[]], [[]])],
[AS_VAR_SET([py_var], [yes])],
[AS_VAR_SET([py_var], [no])],
)]
)
AS_VAR_COPY([CFLAGS], [py_cflags])
AC_CACHE_CHECK(m4_ifblank([$3], [if we can $1 $CC $2 warning], [$3]), [py_var], [
AS_VAR_COPY([py_cflags], [CFLAGS])
AS_VAR_SET([CFLAGS], ["$CFLAGS -W$2 -Werror"])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[AS_VAR_SET([py_var], [yes])],
[AS_VAR_SET([py_var], [no])])
AS_VAR_COPY([CFLAGS], [py_cflags])
])
AC_MSG_RESULT([$py_var])
AS_VAR_POPDEF([py_var])
])
Expand Down