SF patch #712367, get build working on AIX
configure change is necessary to pass "." to makexp_aix so that dynamic modules work setup change gets curses working
This commit is contained in:
parent
aca44e2771
commit
0b27ff92d2
|
@ -3176,7 +3176,12 @@ then
|
||||||
fi
|
fi
|
||||||
case $ac_sys_system in
|
case $ac_sys_system in
|
||||||
AIX*)
|
AIX*)
|
||||||
LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $LINKCC";;
|
exp_extra="\"\""
|
||||||
|
if test $ac_sys_release -ge 5 -o \
|
||||||
|
$ac_sys_release -eq 4 -a `uname -r` -ge 2 ; then
|
||||||
|
exp_extra="."
|
||||||
|
fi
|
||||||
|
LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp $exp_extra \$(LIBRARY); $LINKCC";;
|
||||||
dgux*)
|
dgux*)
|
||||||
LINKCC="LD_RUN_PATH=$libdir $LINKCC";;
|
LINKCC="LD_RUN_PATH=$libdir $LINKCC";;
|
||||||
Monterey64*)
|
Monterey64*)
|
||||||
|
|
|
@ -421,7 +421,12 @@ then
|
||||||
fi
|
fi
|
||||||
case $ac_sys_system in
|
case $ac_sys_system in
|
||||||
AIX*)
|
AIX*)
|
||||||
LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $LINKCC";;
|
exp_extra="\"\""
|
||||||
|
if test $ac_sys_release -ge 5 -o \
|
||||||
|
$ac_sys_release -eq 4 -a `uname -r` -ge 2 ; then
|
||||||
|
exp_extra="."
|
||||||
|
fi
|
||||||
|
LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp $exp_extra \$(LIBRARY); $LINKCC";;
|
||||||
dgux*)
|
dgux*)
|
||||||
LINKCC="LD_RUN_PATH=$libdir $LINKCC";;
|
LINKCC="LD_RUN_PATH=$libdir $LINKCC";;
|
||||||
Monterey64*)
|
Monterey64*)
|
||||||
|
|
6
setup.py
6
setup.py
|
@ -413,6 +413,8 @@ class PyBuildExt(build_ext):
|
||||||
if self.compiler.find_library_file(lib_dirs,
|
if self.compiler.find_library_file(lib_dirs,
|
||||||
'ncurses'):
|
'ncurses'):
|
||||||
readline_libs.append('ncurses')
|
readline_libs.append('ncurses')
|
||||||
|
elif self.compiler.find_library_file(lib_dirs, 'curses'):
|
||||||
|
readline_libs.append('curses')
|
||||||
elif self.compiler.find_library_file(lib_dirs +
|
elif self.compiler.find_library_file(lib_dirs +
|
||||||
['/usr/lib/termcap'],
|
['/usr/lib/termcap'],
|
||||||
'termcap'):
|
'termcap'):
|
||||||
|
@ -654,8 +656,10 @@ class PyBuildExt(build_ext):
|
||||||
# the _curses module.
|
# the _curses module.
|
||||||
if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
|
if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
|
||||||
curses_libs = ['curses', 'terminfo']
|
curses_libs = ['curses', 'terminfo']
|
||||||
else:
|
elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
|
||||||
curses_libs = ['curses', 'termcap']
|
curses_libs = ['curses', 'termcap']
|
||||||
|
else:
|
||||||
|
curses_libs = ['curses']
|
||||||
|
|
||||||
exts.append( Extension('_curses', ['_cursesmodule.c'],
|
exts.append( Extension('_curses', ['_cursesmodule.c'],
|
||||||
libraries = curses_libs) )
|
libraries = curses_libs) )
|
||||||
|
|
Loading…
Reference in New Issue