GeezerVison is showing github.com — [3.14] gh-155911: Fix curses detection with libraries in LIBS (GH-156… · python/cpython@90235cb
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboard +2Lines changed: 2 additions & 0 deletions - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +Fix curses detection when a curses library is already in ``LIBS``. |
| 2 | +Patch by Shamil Abdulaev. |
Collapse file
Copy file name to clipboardExpand all lines: configure +3-2Lines changed: 3 additions & 2 deletions Collapse file
Copy file name to clipboardExpand all lines: configure.ac +3-2Lines changed: 3 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -6952,8 +6952,9 @@ WITH_SAVE_ENV([ |
6952 | 6952 | ])) |
6953 | 6953 |
|
6954 | 6954 | # Check that we're able to link with crucial curses/panel functions. This |
6955 | | - # also serves as a fallback in case pkg-config failed. |
6956 | | - AS_VAR_APPEND([LIBS], [" $CURSES_LIBS $PANEL_LIBS"]) |
| 6955 | + # also serves as a fallback in case pkg-config failed. Extension modules are |
| 6956 | + # not linked with LIBS, so exclude it to get the required libraries. |
| 6957 | + LIBS="$CURSES_LIBS $PANEL_LIBS" |
6957 | 6958 | AC_SEARCH_LIBS([initscr], [ncursesw ncurses], |
6958 | 6959 | [AS_VAR_IF([have_curses], [no], |
6959 | 6960 | [AS_VAR_SET([have_curses], [yes]) |
|