Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-94642: Remove -D_XOPEN_SOURCE from more pkg-config CFLAGS (#94657) 

Some pkg-config pc files define CFLAGS with -D_XOPEN_SOURCE=600. We always want _XOPEN_SOURCE=700.
This commit is contained in:
Christian Heimes 2022-07-07 14:47:32 +02:00 committed by GitHub
parent ed136b9673
commit 29f86d6c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure generated vendored
View File

@ -21031,6 +21031,7 @@ fi
fi fi
READLINE_CFLAGS=$(echo $READLINE_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link readline" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link readline" >&5
$as_echo_n "checking how to link readline... " >&6; } $as_echo_n "checking how to link readline... " >&6; }
@ -22028,7 +22029,7 @@ fi
fi fi
CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//') CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
@ -22460,6 +22461,8 @@ fi
fi fi
PANEL_CFLAGS=$(echo $PANEL_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking panel flags" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking panel flags" >&5
$as_echo_n "checking panel flags... " >&6; } $as_echo_n "checking panel flags... " >&6; }
if test "x$have_panel" = xno; then : if test "x$have_panel" = xno; then :

7
configure.ac
View File

@ -5850,6 +5850,8 @@ AS_VAR_IF([with_readline], [edit], [
]) ])
]) ])
dnl pyconfig.h defines _XOPEN_SOURCE=700
READLINE_CFLAGS=$(echo $READLINE_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
AC_MSG_CHECKING([how to link readline]) AC_MSG_CHECKING([how to link readline])
AS_VAR_IF([with_readline], [no], [ AS_VAR_IF([with_readline], [no], [
@ -6144,7 +6146,7 @@ AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [
dnl remove _XOPEN_SOURCE macro from curses cflags. pyconfig.h sets dnl remove _XOPEN_SOURCE macro from curses cflags. pyconfig.h sets
dnl the macro to 700. dnl the macro to 700.
CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//') CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw. dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw.
@ -6204,6 +6206,9 @@ AS_VAR_IF([ac_cv_header_panel_h], [yes], [
])dnl ac_cv_header_panel_h = yes ])dnl ac_cv_header_panel_h = yes
dnl pyconfig.h defines _XOPEN_SOURCE=700
PANEL_CFLAGS=$(echo $PANEL_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
AC_MSG_CHECKING([panel flags]) AC_MSG_CHECKING([panel flags])
AS_VAR_IF([have_panel], [no], [ AS_VAR_IF([have_panel], [no], [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])