Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-36503: remove references to 'aix3' and 'aix4' (GH-12658)

This commit is contained in:
Michael Felt 2019-04-08 02:51:33 +02:00 committed by Inada Naoki
parent 6463ba3061
commit b7eec94c0e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_fcntl.py
View File

@ -34,7 +34,7 @@ def get_lockdata():
fcntl.F_WRLCK, 0) fcntl.F_WRLCK, 0)
elif sys.platform.startswith('gnukfreebsd'): elif sys.platform.startswith('gnukfreebsd'):
lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0) lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0)
elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']: elif sys.platform in ['hp-uxB', 'unixware7']:
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0) lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
else: else:
lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0) lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)

1
Misc/ACKS
View File

@ -476,6 +476,7 @@ Jim Fasarakis-Hilliard
Mark Favas Mark Favas
Sergey Fedoseev Sergey Fedoseev
Boris Feld Boris Feld
M. Felt
Thomas Fenzl Thomas Fenzl
Niels Ferguson Niels Ferguson
Francisco Fernández Castaño Francisco Fernández Castaño

2
Misc/NEWS.d/next/Build/2019-04-02-09-25-23.bpo-36503.0xzfkQ.rst Normal file
View File

@ -0,0 +1,2 @@
Remove references to "aix3" and "aix4".
Patch by M. Felt.

3
setup.py
View File

@ -1882,9 +1882,6 @@ class PyBuildExt(build_ext):
libs.append('tk'+ version) libs.append('tk'+ version)
libs.append('tcl'+ version) libs.append('tcl'+ version)
if HOST_PLATFORM in ['aix3', 'aix4']:
libs.append('ld')
# Finally, link with the X11 libraries (not appropriate on cygwin) # Finally, link with the X11 libraries (not appropriate on cygwin)
if not CYGWIN: if not CYGWIN:
libs.append('X11') libs.append('X11')