From d583141572da4cdeb8ca1cf9a7354e48b49994ca Mon Sep 17 00:00:00 2001 From: Ayappan P Date: Tue, 17 Oct 2023 03:02:45 -0400 Subject: [PATCH 1/5] pythongh-110828: AIX 32bit build needs -latomic for _testcapi module --- configure | 2 ++ configure.ac | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c87f518382f2ec..4bd44fdb40e65a 100755 --- a/configure +++ b/configure @@ -27926,6 +27926,7 @@ printf "%s\n" "$ac_cv_libatomic_needed" >&6; } if test "x$ac_cv_libatomic_needed" = xyes then : LIBS="${LIBS} -latomic" + LIBATOMIC=${LIBATOMIC-"-latomic"} fi CPPFLAGS=$save_CPPFLAGS @@ -30080,6 +30081,7 @@ then : +as_fn_append MODULE_BLOCK "MODULE__TESTCAPI_LDFLAGS=$LIBATOMIC$as_nl" fi if test "$py_cv_module__testcapi" = yes; then diff --git a/configure.ac b/configure.ac index cd69f0ede54496..8f0cbd1eb9ef51 100644 --- a/configure.ac +++ b/configure.ac @@ -7051,7 +7051,8 @@ int main() ]) AS_VAR_IF([ac_cv_libatomic_needed], [yes], - [LIBS="${LIBS} -latomic"]) + [LIBS="${LIBS} -latomic" + LIBATOMIC=${LIBATOMIC-"-latomic"}]) _RESTORE_VAR([CPPFLAGS]) @@ -7323,7 +7324,10 @@ PY_STDLIB_MOD([_hashlib], [], [test "$ac_cv_working_openssl_hashlib" = yes], [$OPENSSL_INCLUDES], [$OPENSSL_LDFLAGS $OPENSSL_LDFLAGS_RPATH $LIBCRYPTO_LIBS]) dnl test modules -PY_STDLIB_MOD([_testcapi], [test "$TEST_MODULES" = yes]) +PY_STDLIB_MOD([_testcapi], + [test "$TEST_MODULES" = yes], [] + dnl Modules/_testcapi needs -latomic for 32bit AIX build + [], [], [$LIBATOMIC]) PY_STDLIB_MOD([_testclinic], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testclinic_limited], [test "$TEST_MODULES" = yes]) PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES" = yes]) From 0b9d837b9b34150637cd4a8b4c1214f852ecb310 Mon Sep 17 00:00:00 2001 From: Ayappan P Date: Tue, 17 Oct 2023 03:11:28 -0400 Subject: [PATCH 2/5] Add NEWS entry --- .../next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst diff --git a/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst b/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst new file mode 100644 index 00000000000000..63b8fd857ccf50 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst @@ -0,0 +1 @@ +AIX 32bit build needs -latomic for _testcapi module build From 0250c574aca62d7756efdeae4a898eb45d819989 Mon Sep 17 00:00:00 2001 From: Ayappan P Date: Tue, 17 Oct 2023 04:24:09 -0400 Subject: [PATCH 3/5] Re-generate configure file --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4bd44fdb40e65a..54310dde38c4f2 100755 --- a/configure +++ b/configure @@ -27926,7 +27926,7 @@ printf "%s\n" "$ac_cv_libatomic_needed" >&6; } if test "x$ac_cv_libatomic_needed" = xyes then : LIBS="${LIBS} -latomic" - LIBATOMIC=${LIBATOMIC-"-latomic"} + LIBATOMIC=${LIBATOMIC-"-latomic"} fi CPPFLAGS=$save_CPPFLAGS @@ -30080,8 +30080,7 @@ fi then : - -as_fn_append MODULE_BLOCK "MODULE__TESTCAPI_LDFLAGS=$LIBATOMIC$as_nl" + as_fn_append MODULE_BLOCK "MODULE__TESTCAPI_LDFLAGS=$LIBATOMIC$as_nl" fi if test "$py_cv_module__testcapi" = yes; then From 44f45b9d7c035fbc772c717a85d144540287886a Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 20 Oct 2023 13:27:56 +0200 Subject: [PATCH 4/5] Update Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst --- .../next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst b/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst index 63b8fd857ccf50..13647fee058021 100644 --- a/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst +++ b/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst @@ -1 +1 @@ -AIX 32bit build needs -latomic for _testcapi module build +AIX 32bit needs ``-latomic`` to build the :mod:`!_testcapi` extension module. From bfb4cca65eea7d253d7090450851336e677942b1 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 20 Oct 2023 18:31:15 +0200 Subject: [PATCH 5/5] Remove superfluous quote --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8f0cbd1eb9ef51..f34ce05d0c947d 100644 --- a/configure.ac +++ b/configure.ac @@ -7325,7 +7325,7 @@ PY_STDLIB_MOD([_hashlib], [], [test "$ac_cv_working_openssl_hashlib" = yes], dnl test modules PY_STDLIB_MOD([_testcapi], - [test "$TEST_MODULES" = yes], [] + [test "$TEST_MODULES" = yes], dnl Modules/_testcapi needs -latomic for 32bit AIX build [], [], [$LIBATOMIC]) PY_STDLIB_MOD([_testclinic], [test "$TEST_MODULES" = yes])