From b918d85fd3a46b618f7c9f54841822eb7a10457b Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@python.org>
Date: Thu, 7 Jul 2022 14:17:24 +0200
Subject: [PATCH] gh-94642: Remove -D_XOPEN_SOURCE from more pkg-config CFLAGS

Some pkg-config pc files define CFLAGS with -D_XOPEN_SOURCE=600. We
always want _XOPEN_SOURCE=700.
---
 configure    | 5 ++++-
 configure.ac | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index bb0625432d211e..5f2830338ee8fa 100755
--- a/configure
+++ b/configure
@@ -21031,6 +21031,7 @@ 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_n "checking how to link readline... " >&6; }
@@ -22028,7 +22029,7 @@ 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
 
@@ -22460,6 +22461,8 @@ 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_n "checking panel flags... " >&6; }
 if test "x$have_panel" = xno; then :
diff --git a/configure.ac b/configure.ac
index fde61728e7ef82..88219dc9b54643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
 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 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
   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 pyconfig.h defines _XOPEN_SOURCE=700
+PANEL_CFLAGS=$(echo $PANEL_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
+
 AC_MSG_CHECKING([panel flags])
 AS_VAR_IF([have_panel], [no], [
   AC_MSG_RESULT([no])