diff mbox series

python3: Fix -Wundef errors in public headers

Message ID 20261120080335.895150-1-khem.raj@oss.qualcomm.com
State Under Review
Headers show
Series python3: Fix -Wundef errors in public headers | expand

Commit Message

Khem Raj Nov. 20, 2026, 8:03 a.m. UTC
Python 3.15.2 headers test _Py_STDC_VERSION without checking that it is
defined, and pymacro.h even checks !defined() before comparing it. The
macro is not defined when compiling C++, so C++ code including Python.h
with -Werror=undef fails, e.g. libpeas:

  pyport.h:494:9: error: '_Py_STDC_VERSION' is not defined, evaluates
  to 0 [-Werror,-Wundef]

The inverted pymacro.h check also drops the C11-C17 static_assert
fallback. Backport both fixes from the 3.15 branch.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 ...ly-use-_Py_STDC_VERSION-when-defined.patch | 81 +++++++++++++++++++
 ...store-C11-C17-static_assert-fallback.patch | 50 ++++++++++++
 .../recipes-devtools/python/python3_3.15.2.bb |  2 +
 3 files changed, 133 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3/0001-3.15-gh-154643-Only-use-_Py_STDC_VERSION-when-defined.patch
 create mode 100644 meta/recipes-devtools/python/python3/0001-3.15-gh-160704-Restore-C11-C17-static_assert-fallback.patch
diff mbox series

Patch

diff --git a/meta/recipes-devtools/python/python3/0001-3.15-gh-154643-Only-use-_Py_STDC_VERSION-when-defined.patch b/meta/recipes-devtools/python/python3/0001-3.15-gh-154643-Only-use-_Py_STDC_VERSION-when-defined.patch
new file mode 100644
index 0000000000..038300b081
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-3.15-gh-154643-Only-use-_Py_STDC_VERSION-when-defined.patch
@@ -0,0 +1,81 @@ 
+From beff3c022fe787f6879c7e38a6b8a64243184ab3 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <31488909+miss-islington@users.noreply.github.com>
+Date: Thu, 12 Nov 2026 07:39:16 -0800
+Subject: [PATCH] [3.15] gh-154643: Only use _Py_STDC_VERSION when defined
+ (GH-154650) (GH-161874)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-authored-by: Miro HronĨok <miro@hroncok.cz>
+
+Upstream-Status: Backport [https://github.com/python/cpython/commit/beff3c022fe787f6879c7e38a6b8a64243184ab3]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Include/cpython/pyatomic.h                                  | 2 +-
+ Include/pyport.h                                            | 2 +-
+ Lib/test/test_cext/setup.py                                 | 6 ++++++
+ .../C_API/2026-07-24-22-30-40.gh-issue-154643.z-ZutK.rst    | 2 ++
+ 4 files changed, 10 insertions(+), 2 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/C_API/2026-07-24-22-30-40.gh-issue-154643.z-ZutK.rst
+
+diff --git a/Include/cpython/pyatomic.h b/Include/cpython/pyatomic.h
+index 71a76bdc82ce475..0a11f7781f07e00 100644
+--- a/Include/cpython/pyatomic.h
++++ b/Include/cpython/pyatomic.h
+@@ -585,7 +585,7 @@ static inline void _Py_atomic_fence_release(void);
+ #  define Py_ATOMIC_GCC_H
+ #  include "pyatomic_gcc.h"
+ #  undef Py_ATOMIC_GCC_H
+-#elif _Py_STDC_VERSION >= 201112L && !defined(__STDC_NO_ATOMICS__)
++#elif defined(_Py_STDC_VERSION) && _Py_STDC_VERSION >= 201112L && !defined(__STDC_NO_ATOMICS__)
+ #  define Py_ATOMIC_STD_H
+ #  include "pyatomic_std.h"
+ #  undef Py_ATOMIC_STD_H
+diff --git a/Include/pyport.h b/Include/pyport.h
+index 6bf011e87709cc0..44d76511fbffbe2 100644
+--- a/Include/pyport.h
++++ b/Include/pyport.h
+@@ -491,7 +491,7 @@ extern "C" {
+ #ifdef WITH_THREAD
+ #  ifdef thread_local
+ #    define _Py_thread_local thread_local
+-#  elif _Py_STDC_VERSION >= 201112L && !defined(__STDC_NO_THREADS__)
++#  elif defined(_Py_STDC_VERSION) && _Py_STDC_VERSION >= 201112L && !defined(__STDC_NO_THREADS__)
+ #    define _Py_thread_local _Thread_local
+ #  elif defined(_MSC_VER)  /* AKA NT_THREADS */
+ #    define _Py_thread_local __declspec(thread)
+diff --git a/Lib/test/test_cext/setup.py b/Lib/test/test_cext/setup.py
+index 10a3887931932ac..3b613ee729f52c4 100644
+--- a/Lib/test/test_cext/setup.py
++++ b/Lib/test/test_cext/setup.py
+@@ -42,6 +42,9 @@
+ 
+         # Ask for strict(er) compliance with the standard
+         '-pedantic-errors',
++
++        # gh-154643: Headers should not use undefined macros in #if
++        '-Werror=undef',
+     ]
+     if not support.Py_GIL_DISABLED:
+         PUBLIC_CFLAGS.append(
+@@ -94,6 +97,9 @@
+ 
+         # We also use `long long`, a C++11 feature we can enable individually.
+         '-Wno-long-long',
++
++        # gh-154643: Headers should not use undefined macros in #if
++        '-Werror=undef',
+     ]
+     INTERNAL_CXXFLAGS = [
+         # Do not complain about unused parameteres in the internal C API
+diff --git a/Misc/NEWS.d/next/C_API/2026-07-24-22-30-40.gh-issue-154643.z-ZutK.rst b/Misc/NEWS.d/next/C_API/2026-07-24-22-30-40.gh-issue-154643.z-ZutK.rst
+new file mode 100644
+index 000000000000000..17c2a58555e7ae9
+--- /dev/null
++++ b/Misc/NEWS.d/next/C_API/2026-07-24-22-30-40.gh-issue-154643.z-ZutK.rst
+@@ -0,0 +1,2 @@
++In ``pyport.h`` and ``pyatomic.h`` don't use ``_Py_STDC_VERSION`` when it is
++not defined, fixing build errors for C or C++ code built with ``-Werror=undef``.
diff --git a/meta/recipes-devtools/python/python3/0001-3.15-gh-160704-Restore-C11-C17-static_assert-fallback.patch b/meta/recipes-devtools/python/python3/0001-3.15-gh-160704-Restore-C11-C17-static_assert-fallback.patch
new file mode 100644
index 0000000000..ac8a5bcd75
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-3.15-gh-160704-Restore-C11-C17-static_assert-fallback.patch
@@ -0,0 +1,50 @@ 
+From 9b6a1a1abf3febbe7ce24dd6fc46c846e544a480 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <31488909+miss-islington@users.noreply.github.com>
+Date: Wed, 28 Oct 2026 07:56:04 -0700
+Subject: [PATCH] [3.15] gh-160704: Restore C11-C17 `static_assert` fallback
+ (GH-160705) (GH-160825)
+
+gh-160704: Restore C11-C17 `static_assert` fallback (GH-160705)
+
+`_Py_STDC_VERSION` needs to be defined before its value can be checked.
+In 8335bcbf26b (gh-160208: Add a private wrapper around __STDC_VERSION__
+(GH-160376), 2026-10-23), the condition `defined(_Py_STDC_VERSION)` is
+incorrectly negated, which prevents the fallback definition of
+`static_assert` in C11-C17 builds and causes a build error when building
+with an old C library that does not define `static_assert`.
+(cherry picked from commit a7ac7a8175ff64c2848f54644f5449ad44466a62)
+
+Signed-off-by: Ruoyu Zhong <zhongruoyu@outlook.com>
+Co-authored-by: Ruoyu Zhong <zhongruoyu@outlook.com>
+
+Upstream-Status: Backport [https://github.com/python/cpython/commit/9b6a1a1abf3febbe7ce24dd6fc46c846e544a480]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Include/pymacro.h                                               | 2 +-
+ .../next/Build/2026-10-26-21-00-00.gh-issue-160704.ZRYLKF.rst   | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 Misc/NEWS.d/next/Build/2026-10-26-21-00-00.gh-issue-160704.ZRYLKF.rst
+
+diff --git a/Include/pymacro.h b/Include/pymacro.h
+index 29d20953235651b..5f1ee98dd3ff46c 100644
+--- a/Include/pymacro.h
++++ b/Include/pymacro.h
+@@ -25,7 +25,7 @@
+ // behaviour. So only define if building as C, not C++ (if __cplusplus is
+ // not defined), and only for C11-17.
+ #if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__)) \
+-     && !defined(_Py_STDC_VERSION) \
++     && defined(_Py_STDC_VERSION) \
+      && _Py_STDC_VERSION >= 201112L && _Py_STDC_VERSION <= 201710L
+ #  define static_assert _Static_assert
+ #endif
+diff --git a/Misc/NEWS.d/next/Build/2026-10-26-21-00-00.gh-issue-160704.ZRYLKF.rst b/Misc/NEWS.d/next/Build/2026-10-26-21-00-00.gh-issue-160704.ZRYLKF.rst
+new file mode 100644
+index 000000000000000..330415c155cd89a
+--- /dev/null
++++ b/Misc/NEWS.d/next/Build/2026-10-26-21-00-00.gh-issue-160704.ZRYLKF.rst
+@@ -0,0 +1,2 @@
++Fix C11-C17 builds with old C library headers that do not define
++``static_assert``, including glibc versions older than 2.16.
diff --git a/meta/recipes-devtools/python/python3_3.15.2.bb b/meta/recipes-devtools/python/python3_3.15.2.bb
index bfc783c922..775165bbe6 100644
--- a/meta/recipes-devtools/python/python3_3.15.2.bb
+++ b/meta/recipes-devtools/python/python3_3.15.2.bb
@@ -24,6 +24,8 @@  SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-3.15-gh-158097-Make-test_staggered_race_with_eager_t.patch \
            file://0001-3.15-gh-160924-Don-t-run-the-build-Python-with-RUNSH.patch \
            file://0001-gh-160881-Fix-test_is_python_process_non_python_subp.patch \
+           file://0001-3.15-gh-160704-Restore-C11-C17-static_assert-fallback.patch \
+           file://0001-3.15-gh-154643-Only-use-_Py_STDC_VERSION-when-defined.patch \
            "
 SRC_URI:append:class-native = " \
            file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \