Skip to content

bpo-45573: Use pkg-config for Modules/Setup #29164

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

Closed
tiran wants to merge 6 commits into from
Closed

bpo-45573: Use pkg-config for Modules/Setup #29164

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d0e2e8
bpo-45548: Link shared Setup extensions to pybuilddir
tiran Oct 25, 2021
afcd74b
bpo-45573: Use pkg-config for Modules/Setup
tiran Oct 21, 2021
75b3935
Add Modules subdirs to SRCDIRS
tiran Oct 26, 2021
32583fa
Convert Modules/Setup into a template file
tiran Oct 26, 2021
310c4e3
Use AM_CONDITIONALs in Modules/Setup.in
tiran Oct 26, 2021
1ba9652
Add makefile vars
tiran Nov 10, 2021
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
Use AM_CONDITIONALs in Modules/Setup.in
  • Loading branch information
@tiran
tiran committed Oct 26, 2021
commit 310c4e3f6be58a324020d21bfcfd87720f318db3
34 changes: 17 additions & 17 deletions Modules/Setup.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,21 +199,21 @@ time timemodule.c
# Some more UNIX dependent modules -- off by default, since these
# are not supported by all UNIX systems:

#_crypt _cryptmodule.c $(CRYPT_CFLAGS) $(CRYPT_LIBS) # crypt(3); breaks many builds.
#nis nismodule.c $(NIS_CFLAGS) $(NIS_LIBS) # Sun yellow pages -- not everywhere
#@HAVE_CURSES_TRUE@_crypt _cryptmodule.c $(CRYPT_CFLAGS) $(CRYPT_LIBS) # crypt(3); breaks many builds.
#@HAVE_NIS_TRUE@nis nismodule.c $(NIS_CFLAGS) $(NIS_LIBS) # Sun yellow pages -- not everywhere
#termios termios.c # Steen Lumholt's termios module
#resource resource.c # Jeremy Hylton's rlimit interface

# Modules that require external libraries.

#_bz2 _bz2module.c $(BZ2_CFLAGS) $(BZ2_LIBS)
#_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c $(FFI_CFLAGS) $(FFI_LIBS) -DHAVE_FFI_PREP_CIF_VAR -DHAVE_FFI_PREP_CLOSURE_LOC -DHAVE_FFI_CLOSURE_ALLOC
# _dbm _dbmmodule.c # -lndbm # dbm(3)
#_gdbm _gdbmmodule.c -lgdbm
#_lzma _lzmamodule.c $(LZMA_CFLAGS) $(LZMA_LIBS)
#_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 $(SQLITE3_CFLAGS) $(SQLITE3_LIBS)
#_uuid _uuidmodule.c $(UUID_CFLAGS) $(UUID_LIBS)
#zlib zlibmodule.c $(ZLIB_CFLAGS) $(ZLIB_LIBS)
#@HAVE_BZ2_TRUE@_bz2 _bz2module.c $(BZ2_CFLAGS) $(BZ2_LIBS)
#@HAVE_FFI_TRUE@_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c $(FFI_CFLAGS) $(FFI_LIBS) -DHAVE_FFI_PREP_CIF_VAR -DHAVE_FFI_PREP_CLOSURE_LOC -DHAVE_FFI_CLOSURE_ALLOC
#@HAVE_DBM_TRUE@_dbm _dbmmodule.c # -lndbm # dbm(3)
#@HAVE_GDBM_TRUE@_gdbm _gdbmmodule.c -lgdbm
#@HAVE_LZMA_TRUE@_lzma _lzmamodule.c $(LZMA_CFLAGS) $(LZMA_LIBS)
#@HAVE_SQLITE3_TRUE@_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 $(SQLITE3_CFLAGS) $(SQLITE3_LIBS)
#@HAVE_UUID_TRUE@_uuid _uuidmodule.c $(UUID_CFLAGS) $(UUID_LIBS)
#@HAVE_ZLIB_TRUE@zlib zlibmodule.c $(ZLIB_CFLAGS) $(ZLIB_LIBS)


# GNU readline. Unlike previous Python incarnations, GNU readline is
Expand All @@ -228,8 +228,8 @@ time timemodule.c
#readline readline.c $(READLINE_CFLAGS) $(READLINE_LIBS)

# To dynamically link OpenSSL:
#_ssl _ssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS)
#_hashlib _hashopenssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) -lcrypto
#@HAVE_OPENSSL_TRUE@_ssl _ssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS)
#@HAVE_OPENSSL_TRUE@_hashlib _hashopenssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) -lcrypto

# To statically link OpenSSL:
# _ssl _ssl.c $(OPENSSL_INCLUDES) $(OPENSSL_LDFLAGS) \
Expand All @@ -250,7 +250,7 @@ time timemodule.c
# every system.

# *** Always uncomment this (leave the leading underscore in!):
#_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT $(TCLTK_INCLUDES) $(TCLTK_LIBS) \
#@HAVE_TCLTK_TRUE@_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT $(TCLTK_INCLUDES) $(TCLTK_LIBS) \
# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
# -L/usr/local/lib \
# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
Expand Down Expand Up @@ -283,13 +283,13 @@ time timemodule.c
# provided by the ncurses library. e.g. on Linux, link with -lncurses
# instead of -lcurses).

#_curses _cursesmodule.c $(NCURSESW_CFLAGS) $(NCURSESW_LIBS) $(CURSES_CFLAGS) $(CURSES_LIBS)
#@HAVE_CURSES_TRUE@_curses _cursesmodule.c $(NCURSESW_CFLAGS) $(NCURSESW_LIBS) $(CURSES_CFLAGS) $(CURSES_LIBS)

# Wrapper for the panel library that's part of ncurses and SYSV curses.
#_curses_panel _curses_panel.c $(CURSES_PANEL_CFLAGS) $(CURSES_PANEL_LIBS)
#@HAVE_CURSES_PANEL_TRUE@_curses_panel _curses_panel.c $(CURSES_PANEL_CFLAGS) $(CURSES_PANEL_LIBS)

# macOS specific modules
# _scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
#@HAVE_SCPROXY_TRUE@_scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation

# Examples

Expand All @@ -302,7 +302,7 @@ xxsubtype xxsubtype.c # Required for the test suite to pass!

#_xxsubinterpreters _xxsubinterpretersmodule.c
#_xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
#_ctypes_test _ctypes/_ctypes_test.c
#@HAVE_FFI_TRUE@_ctypes_test _ctypes/_ctypes_test.c
#_testbuffer _testbuffer.c
#_testimportmultiple _testimportmultiple.c
#_testinternalcapi _testinternalcapi.c
Expand Down