Skip to content

bpo-36210: correct logic in setup.py for optional extensions with regard to AIX #12202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ncoghlan merged 12 commits into from
Jun 21, 2019
Merged

bpo-36210: correct logic in setup.py for optional extensions with regard to AIX #12202

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ccf40a6
Switch to officially support curses from 3rd-party ASIS supported ncu…
aixtools Mar 6, 2019
178a739
line was too long [PEP 8], now two lines
aixtools Apr 1, 2019
f29cf2c
clarify change and remove repeated boolean logic
aixtools Apr 1, 2019
4d74e70
boolean logic over two lines needs a backslash on first line
aixtools Apr 1, 2019
401a266
stop saying optional modules osaudiodev and spwd are missing on AIX
aixtools Apr 1, 2019
f56b764
update News blurb
aixtools Apr 1, 2019
b922583
Merge branch 'master' into bpo-36210-ncurses
aixtools Jun 20, 2019
c7ca6fd
Modify inline comments and clarify logic
aixtools Jun 20, 2019
7c6b2e7
Add missing backslash
aixtools Jun 20, 2019
d240053
Fix whitespace
aixtools Jun 20, 2019
a0117e0
Update 2019-03-06-18-55-10.bpo-36210.fup9H2.rst
ncoghlan Jun 21, 2019
2572144
use variable skip_curses_panel with AIX
aixtools Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modify inline comments and clarify logic
  • Loading branch information
@aixtools
aixtools committed Jun 20, 2019
commit c7ca6fd038143923775dd56ea16ff02376251613
27 changes: 15 additions & 12 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,8 @@ def detect_simple_extensions(self):
if (self.config_h_vars.get('HAVE_GETSPNAM', False) or
self.config_h_vars.get('HAVE_GETSPENT', False)):
self.add(Extension('spwd', ['spwdmodule.c']))
# AIX has shadow passwords, but access is not via getspent(), etc.
# module support is not to be expected
elif not HOST_PLATFORM.startswith("aix"):
self.missing.append('spwd')

Expand Down Expand Up @@ -909,9 +911,12 @@ def detect_readline_curses(self):
curses_library = readline_termcap_library
elif self.compiler.find_library_file(self.lib_dirs, 'ncursesw'):
curses_library = 'ncursesw'
# Issue 36210: AIX and ncurses does not co-exist with IBM supplied curses
elif self.compiler.find_library_file(self.lib_dirs, 'ncurses') \
and not HOST_PLATFORM.startswith("aix"):
# Issue 36210: OSS provided ncurses does not link on AIX
# Use IBM supplied 'curses' for successful build of _curses
elif HOST_PLATFORM.startswith("aix") and
self.compiler.find_library_file(self.lib_dirs, 'curses'):
curses_library = 'curses'
elif self.compiler.find_library_file(self.lib_dirs, 'ncurses'):
curses_library = 'ncurses'
elif self.compiler.find_library_file(self.lib_dirs, 'curses'):
curses_library = 'curses'
Expand Down Expand Up @@ -981,7 +986,7 @@ def detect_readline_curses(self):
curses_defines.append(('HAVE_NCURSESW', '1'))
curses_defines.append(('_XOPEN_SOURCE_EXTENDED', '1'))

curses_enabled = True
ncurses_enabled = curses_enabled = True
if curses_library.startswith('ncurses'):
curses_libs = [curses_library]
self.add(Extension('_curses', ['_cursesmodule.c'],
Expand All @@ -991,6 +996,7 @@ def detect_readline_curses(self):
elif curses_library == 'curses' and not MACOS:
# OSX has an old Berkeley curses, not good enough for
# the _curses module.
ncurses_enabled = False
Comment thread
aixtools marked this conversation as resolved.
Outdated
if (self.compiler.find_library_file(self.lib_dirs, 'terminfo')):
curses_libs = ['curses', 'terminfo']
elif (self.compiler.find_library_file(self.lib_dirs, 'termcap')):
Expand All @@ -1003,22 +1009,19 @@ def detect_readline_curses(self):
libraries=curses_libs))
else:
curses_enabled = False
ncurses_enabled = False
self.missing.append('_curses')

# If the curses module is enabled, check for the panel module
# Issue 36210:
# AIX libcurses does not support _curses_panel
# 3rd party support for _curses_panel is broken
# hence, ignore _curses_panel on AIX
if not HOST_PLATFORM.startswith("aix"):
if (curses_enabled and
# _curses_panel needs some form of ncurses
if (curses_enabled and ncurses_enabled and
self.compiler.find_library_file(self.lib_dirs, panel_library)):
self.add(Extension('_curses_panel', ['_curses_panel.c'],
include_dirs=curses_includes,
define_macros=curses_defines,
libraries=[panel_library, *curses_libs]))
else:
self.missing.append('_curses_panel')
else:
self.missing.append('_curses_panel')

def detect_crypt(self):
# crypt module.
Expand Down