mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

bpo-45548: Add missing extensions to Modules/Setup (GH-29199)

Browse source 
Adds _ctypes, _decimal, _multiprocessing, _posixshmem, _scproxy, _sqlite3,
and _uuid.

Use Makefile variables to build OpenSSL and TCL/TK modules.

Drop ``-lm`` from math lines. Extensions are always linked against libm.

Signed-off-by: Christian Heimes <christian@python.org>
This commit is contained in:
Christian Heimes 2021-10-25 21:01:52 +03:00 • committed by GitHub
parent 81669d1b7b
commit ece916e92c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Modules/Setup
View file

@ -129,6 +129,9 @@ time timemodule.c
# Python binary, or need to specify some odd set of compiler switches, # Python binary, or need to specify some odd set of compiler switches,
# you can uncomment the appropriate lines below. # you can uncomment the appropriate lines below.
# To enable all modules for testing, run
# sed -n -E 's/^#([a-z_\*].*)$/\1/p' Modules/Setup > Modules/Setup.local
# Uncommenting the following line tells makesetup that all following # Uncommenting the following line tells makesetup that all following
# modules are to be built as shared libraries (see above for more # modules are to be built as shared libraries (see above for more
# detail; also note that *static* or *disabled* cancels this effect): # detail; also note that *static* or *disabled* cancels this effect):
@ -149,12 +152,15 @@ time timemodule.c
#_contextvars _contextvarsmodule.c #_contextvars _contextvarsmodule.c
#_csv _csv.c #_csv _csv.c
#_datetime _datetimemodule.c #_datetime _datetimemodule.c
# UNIVERSAL: let mpdecimal.h detect settings
#_decimal -DUNIVERSAL -I$(srcdir)/Modules/_decimal/libmpdec _decimal/_decimal.c _decimal/libmpdec/basearith.c _decimal/libmpdec/constants.c _decimal/libmpdec/context.c _decimal/libmpdec/convolute.c _decimal/libmpdec/crt.c _decimal/libmpdec/difradix2.c _decimal/libmpdec/fnt.c _decimal/libmpdec/fourstep.c _decimal/libmpdec/io.c _decimal/libmpdec/mpalloc.c _decimal/libmpdec/mpdecimal.c _decimal/libmpdec/numbertheory.c _decimal/libmpdec/sixstep.c _decimal/libmpdec/transpose.c
#_elementtree -I$(srcdir)/Modules/expat _elementtree.c #_elementtree -I$(srcdir)/Modules/expat _elementtree.c
#_heapq _heapqmodule.c #_heapq _heapqmodule.c
#_json _json.c #_json _json.c
#_lsprof _lsprof.c rotatingtree.c #_lsprof _lsprof.c rotatingtree.c
#_md5 md5module.c #_md5 md5module.c
#_multibytecodec cjkcodecs/multibytecodec.c #_multibytecodec cjkcodecs/multibytecodec.c
#_multiprocessing -I$(srcdir)/Modules/_multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/semaphore.c
#_opcode _opcode.c #_opcode _opcode.c
#_pickle _pickle.c #_pickle _pickle.c
#_posixsubprocess _posixsubprocess.c #_posixsubprocess _posixsubprocess.c
@ -171,8 +177,8 @@ time timemodule.c
#array arraymodule.c #array arraymodule.c
#audioop audioop.c #audioop audioop.c
#binascii binascii.c #binascii binascii.c
#cmath cmathmodule.c # -lm #cmath cmathmodule.c
#math mathmodule.c # -lm #math mathmodule.c
#pyexpat -I$(srcdir)/Modules/expat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c #pyexpat -I$(srcdir)/Modules/expat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c
#unicodedata unicodedata.c #unicodedata unicodedata.c
@ -180,6 +186,7 @@ time timemodule.c
# (If you have a really backward UNIX, select and socket may not be # (If you have a really backward UNIX, select and socket may not be
# supported...) # supported...)
#_posixshmem -I$(srcdir)/Modules/_multiprocessing _multiprocessing/posixshmem.c -lrt
#_socket socketmodule.c # socket(2) #_socket socketmodule.c # socket(2)
#fcntl fcntlmodule.c # fcntl(2) and ioctl(2) #fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
#grp grpmodule.c # grp(3) #grp grpmodule.c # grp(3)
@ -192,18 +199,21 @@ time timemodule.c
# Some more UNIX dependent modules -- off by default, since these # Some more UNIX dependent modules -- off by default, since these
# are not supported by all UNIX systems: # are not supported by all UNIX systems:
#_crypt _cryptmodule.c # -lcrypt # crypt(3); breaks many builds. #_crypt _cryptmodule.c -lcrypt # crypt(3); breaks many builds.
#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere #nis nismodule.c -I/usr/include/tirpc -lnsl -ltirpc # Sun yellow pages -- not everywhere
#termios termios.c # Steen Lumholt's termios module #termios termios.c # Steen Lumholt's termios module
#resource resource.c # Jeremy Hylton's rlimit interface #resource resource.c # Jeremy Hylton's rlimit interface
# Modules that require external libraries. # Modules that require external libraries.
#_bz2 _bz2module.c -lbz2 #_bz2 _bz2module.c -lbz2
#_dbm _dbmmodule.c # -lndbm # dbm(3) #_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c -ldl -lffi -DHAVE_FFI_PREP_CIF_VAR -DHAVE_FFI_PREP_CLOSURE_LOC -DHAVE_FFI_CLOSURE_ALLOC
#_gdbm -I/usr/local/include -L/usr/local/lib -lgdbm _gdbmmodule.c # _dbm _dbmmodule.c # -lndbm # dbm(3)
#_gdbm _gdbmmodule.c -lgdbm
#_lzma _lzmamodule.c -llzma #_lzma _lzmamodule.c -llzma
#zlib -I$(prefix)/include -L$(exec_prefix)/lib -lz zlibmodule.c #_sqlite3 _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c -lsqlite3
#_uuid _uuidmodule.c -luuid
#zlib zlibmodule.c -lz
# GNU readline. Unlike previous Python incarnations, GNU readline is # GNU readline. Unlike previous Python incarnations, GNU readline is
# now incorporated in an optional module, configured in the Setup file # now incorporated in an optional module, configured in the Setup file
@ -215,29 +225,16 @@ time timemodule.c
#readline readline.c -lreadline -ltermcap #readline readline.c -lreadline -ltermcap
# Set OpenSSL when not using the system copy found by ./configure.
#OPENSSL=/path/to/openssl/directory
# To dynamically link OpenSSL: # To dynamically link OpenSSL:
#_ssl _ssl.c \ #_ssl _ssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS)
# -I$(OPENSSL)/include -L$(OPENSSL)/lib \ #_hashlib _hashopenssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) -lcrypto
# -lssl -lcrypto \
# -DPy_BUILD_CORE_BUILTIN
#_hashlib _hashopenssl.c \
# -I$(OPENSSL)/include -L$(OPENSSL)/lib \
# -lcrypto \
# -DPy_BUILD_CORE_BUILTIN
# To statically link OpenSSL: # To statically link OpenSSL:
#_ssl _ssl.c \ # _ssl _ssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) \
# -I$(OPENSSL)/include -L$(OPENSSL)/lib \
# -l:libssl.a -Wl,--exclude-libs,libssl.a \ # -l:libssl.a -Wl,--exclude-libs,libssl.a \
# -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a \ # -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a
# -DPy_BUILD_CORE_BUILTIN # _hashlib _hashopenssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) \
#_hashlib _hashopenssl.c \ # -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a
# -I$(OPENSSL)/include -L$(OPENSSL)/lib \
# -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a \
# -DPy_BUILD_CORE_BUILTIN
# The _tkinter module. # The _tkinter module.
# #
@ -251,7 +248,7 @@ time timemodule.c
# every system. # every system.
# *** Always uncomment this (leave the leading underscore in!): # *** Always uncomment this (leave the leading underscore in!):
# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ #_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT $(TCLTK_INCLUDES) $(TCLTK_LIBS) \
# *** Uncomment and edit to reflect where your Tcl/Tk libraries are: # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
# -L/usr/local/lib \ # -L/usr/local/lib \
# *** Uncomment and edit to reflect where your Tcl/Tk headers are: # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
@ -269,8 +266,6 @@ time timemodule.c
# -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \
# *** Uncomment and edit for TOGL extension only: # *** Uncomment and edit for TOGL extension only:
# -DWITH_TOGL togl.c \ # -DWITH_TOGL togl.c \
# *** Uncomment and edit to reflect your Tcl/Tk versions:
# -ltk8.2 -ltcl8.2 \
# *** Uncomment and edit to reflect where your X11 libraries are: # *** Uncomment and edit to reflect where your X11 libraries are:
# -L/usr/X11R6/lib \ # -L/usr/X11R6/lib \
# *** Or uncomment this for Solaris: # *** Or uncomment this for Solaris:
@ -286,11 +281,14 @@ time timemodule.c
# provided by the ncurses library. e.g. on Linux, link with -lncurses # provided by the ncurses library. e.g. on Linux, link with -lncurses
# instead of -lcurses). # instead of -lcurses).
#_curses -lcurses -ltermcap _cursesmodule.c #_curses -lcurses -lcursesw -ltermcap _cursesmodule.c
# Wrapper for the panel library that's part of ncurses and SYSV curses. # Wrapper for the panel library that's part of ncurses and SYSV curses.
#_curses_panel -lpanel -lncurses _curses_panel.c #_curses_panel -lpanel -lncurses _curses_panel.c
# macOS specific modules
# _scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
# Examples # Examples
#xx xxmodule.c #xx xxmodule.c
@ -302,12 +300,14 @@ xxsubtype xxsubtype.c # Required for the test suite to pass!
#_xxsubinterpreters _xxsubinterpretersmodule.c #_xxsubinterpreters _xxsubinterpretersmodule.c
#_xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c #_xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
#_ctypes_test _ctypes/_ctypes_test.c
#_testbuffer _testbuffer.c #_testbuffer _testbuffer.c
#_testcapi _testcapimodule.c # CANNOT be statically compiled!
#_testimportmultiple _testimportmultiple.c #_testimportmultiple _testimportmultiple.c
#_testinternalcapi _testinternalcapi.c #_testinternalcapi _testinternalcapi.c
#_testmultiphase _testmultiphase.c #_testmultiphase _testmultiphase.c
#*shared*
#_testcapi _testcapimodule.c # CANNOT be statically compiled!
# --- # ---
# Uncommenting the following line tells makesetup that all following modules # Uncommenting the following line tells makesetup that all following modules
@ -315,5 +315,5 @@ xxsubtype xxsubtype.c # Required for the test suite to pass!
# #
#*disabled* #*disabled*
# #
#_sqlite3 _tkinter _curses pyexpat # _sqlite3 _tkinter _curses pyexpat
#_codecs_jp _codecs_kr _codecs_tw unicodedata # _codecs_jp _codecs_kr _codecs_tw unicodedata