[3.13] gh-155911: Fix curses detection with libraries in LIBS (GH-156130) (GH-156225)
serhiy-storchaka <[email protected]>
| Newsgroups | gmane.comp.python.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/python/cpython/commit/c2dd934fb8e120f14ad50e58f9378872e8630fa3 commit: c2dd934fb8e120f14ad50e58f9378872e8630fa3 branch: 3.13 author: Serhiy Storchaka <[email protected]> committer: serhiy-storchaka <[email protected]> date: 2026-08-22T12:08:25+03:00 summary: [3.13] gh-155911: Fix curses detection with libraries in LIBS (GH-156130) (GH-156225) AC_SEARCH_LIBS tries linking with no extra library first, so a curses library already in LIBS made the search report "none required", which then became the module's link flag. Search with only the libraries the module is linked with. (cherry picked from commit f74cdf80a120649e4c353430da8cbd1305c00993) Co-authored-by: Shamil <[email protected]> files: A Misc/NEWS.d/next/Build/2026-08-20-17-41-11.gh-issue-155911.yL3z8q.rst M configure M configure.ac diff --git a/Misc/NEWS.d/next/Build/2026-08-20-17-41-11.gh-issue-155911.yL3z8q.rst b/Misc/NEWS.d/next/Build/2026-08-20-17-41-11.gh-issue-155911.yL3z8q.rst new file mode 100644 index 00000000000000..ec3c798995849b --- /dev/null +++ b/Misc/NEWS.d/next/Build/2026-08-20-17-41-11.gh-issue-155911.yL3z8q.rst @@ -0,0 +1,2 @@ +Fix curses detection when a curses library is already in ``LIBS``. +Patch by Shamil Abdulaev. diff --git a/configure b/configure index b966078962d8a3..73d317a659b717 100755 --- a/configure +++ b/configure @@ -26698,8 +26698,9 @@ fi # Check that we're able to link with crucial curses/panel functions. This - # also serves as a fallback in case pkg-config failed. - as_fn_append LIBS " $CURSES_LIBS $PANEL_LIBS" + # also serves as a fallback in case pkg-config failed. Extension modules are + # not linked with LIBS, so exclude it to get the required libraries. + LIBS="$CURSES_LIBS $PANEL_LIBS" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 printf %s "checking for library containing initscr... " >&6; } if test ${ac_cv_search_initscr+y} diff --git a/configure.ac b/configure.ac index 7614dfb79e74a6..4ef6de9dd6e535 100644 --- a/configure.ac +++ b/configure.ac @@ -6839,8 +6839,9 @@ WITH_SAVE_ENV([ ])) # Check that we're able to link with crucial curses/panel functions. This - # also serves as a fallback in case pkg-config failed. - AS_VAR_APPEND([LIBS], [" $CURSES_LIBS $PANEL_LIBS"]) + # also serves as a fallback in case pkg-config failed. Extension modules are + # not linked with LIBS, so exclude it to get the required libraries. + LIBS="$CURSES_LIBS $PANEL_LIBS" AC_SEARCH_LIBS([initscr], [ncursesw ncurses], [AS_VAR_IF([have_curses], [no], [AS_VAR_SET([have_curses], [yes]) _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3//lists/python-checkins.python.org Member address: [email protected]