diff options
| author | Ayappan Perumal <ayappap2@in.ibm.com> | 2023-10-22 20:58:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-22 20:58:52 (GMT) |
| commit | 88bac5d5044e577825db1f9367af908dc9a3ad82 (patch) | |
| tree | 651e0d2d0aec6eb5be5f1a00f36c7d79af8141e9 | |
| parent | 767f416feb551f495bacfff1e9ba1e6672c2f24e (diff) | |
| download | cpython-88bac5d5044e577825db1f9367af908dc9a3ad82.zip cpython-88bac5d5044e577825db1f9367af908dc9a3ad82.tar.gz cpython-88bac5d5044e577825db1f9367af908dc9a3ad82.tar.bz2 | |
gh-110828: AIX 32bit build needs -latomic for _testcapi module (#110962)
| -rw-r--r-- | Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst | 1 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 9 insertions, 3 deletions
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 0000000..13647fe --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst @@ -0,0 +1 @@ +AIX 32bit needs ``-latomic`` to build the :mod:`!_testcapi` extension module. @@ -27931,6 +27931,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 @@ -30084,7 +30085,7 @@ fi 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 daa59b2..a4ac589 100644 --- a/configure.ac +++ b/configure.ac @@ -7056,7 +7056,8 @@ int main() ]) AS_VAR_IF([ac_cv_libatomic_needed], [yes], - [LIBS="${LIBS} -latomic"]) + [LIBS="${LIBS} -latomic" + LIBATOMIC=${LIBATOMIC-"-latomic"}]) _RESTORE_VAR([CPPFLAGS]) @@ -7328,7 +7329,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]) |