[Python-checkins] gh-98707: configure --with-system-libmpdec and --with-system-expat no longer include vendored headers (#98711)

Fri Nov 11 13:59:42 EST 2022

https://github.com/python/cpython/commit/6abec1caffdba2e282b14fe57c6ce61974de4bbe
commit: 6abec1caffdba2e282b14fe57c6ce61974de4bbe
branch: main
author: Miro Hrončok <miro at hroncok.cz>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022年11月11日T19:59:30+01:00
summary:
gh-98707: configure --with-system-libmpdec and --with-system-expat no longer include vendored headers (#98711)
files:
A Misc/NEWS.d/next/Build/2022-10-26-12-37-52.gh-issue-98707.eVXGEx.rst
M Makefile.pre.in
M configure
M configure.ac

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2c0ff3d1c7b9..fd0916ec3e41 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2588,13 +2588,13 @@ MODULE_DEPS=$(PYTHON_HEADERS) Modules/config.c $(EXPORTSYMS)
 
 MODULE_CMATH_DEPS=$(srcdir)/Modules/_math.h
 MODULE_MATH_DEPS=$(srcdir)/Modules/_math.h
-MODULE_PYEXPAT_DEPS=$(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
+MODULE_PYEXPAT_DEPS=@LIBEXPAT_INTERNAL@
 MODULE_UNICODEDATA_DEPS=$(srcdir)/Modules/unicodedata_db.h $(srcdir)/Modules/unicodename_db.h
 MODULE__BLAKE2_DEPS=$(srcdir)/Modules/_blake2/impl/blake2-config.h $(srcdir)/Modules/_blake2/impl/blake2-impl.h $(srcdir)/Modules/_blake2/impl/blake2.h $(srcdir)/Modules/_blake2/impl/blake2b-load-sse2.h $(srcdir)/Modules/_blake2/impl/blake2b-load-sse41.h $(srcdir)/Modules/_blake2/impl/blake2b-ref.c $(srcdir)/Modules/_blake2/impl/blake2b-round.h $(srcdir)/Modules/_blake2/impl/blake2b.c $(srcdir)/Modules/_blake2/impl/blake2s-load-sse2.h $(srcdir)/Modules/_blake2/impl/blake2s-load-sse41.h $(srcdir)/Modules/_blake2/impl/blake2s-load-xop.h $(srcdir)/Modules/_blake2/impl/blake2s-ref.c $(srcdir)/Modules/_blake2/impl/blake2s-round.h $(srcdir)/Modules/_blake2/impl/blake2s.c $(srcdir)/Modules/_blake2/blake2module.h $(srcdir)/Modules/hashlib.h
 MODULE__CTYPES_DEPS=$(srcdir)/Modules/_ctypes/ctypes.h $(srcdir)/Modules/_ctypes/darwin/dlfcn.h
 MODULE__CTYPES_MALLOC_CLOSURE=@MODULE__CTYPES_MALLOC_CLOSURE@
-MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h $(LIBMPDEC_HEADERS) @LIBMPDEC_INTERNAL@
-MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c $(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
+MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h @LIBMPDEC_INTERNAL@
+MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c @LIBEXPAT_INTERNAL@
 MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h
 MODULE__IO_DEPS=$(srcdir)/Modules/_io/_iomodule.h
 MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h
diff --git a/Misc/NEWS.d/next/Build/2022-10-26-12-37-52.gh-issue-98707.eVXGEx.rst b/Misc/NEWS.d/next/Build/2022-10-26-12-37-52.gh-issue-98707.eVXGEx.rst
new file mode 100644
index 000000000000..69afa9dea307
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-10-26-12-37-52.gh-issue-98707.eVXGEx.rst
@@ -0,0 +1,4 @@
+Don't use vendored ``libmpdec`` headers if :option:`--with-system-libmpdec`
+is passed to :program:`configure`.
+Don't use vendored ``libexpat`` headers if :option:`--with-system-expat`
+is passed to :program:`!configure`.
diff --git a/configure b/configure
index 97fd931a95db..b5c1eb51fd3e 100755
--- a/configure
+++ b/configure
@@ -12507,7 +12507,7 @@ else
 
 LIBEXPAT_CFLAGS="-I\$(srcdir)/Modules/expat"
 LIBEXPAT_LDFLAGS="-lm \$(LIBEXPAT_A)"
- LIBEXPAT_INTERNAL="\$(LIBEXPAT_A)"
+ LIBEXPAT_INTERNAL="\$(LIBEXPAT_HEADERS) \$(LIBEXPAT_A)"
 
 fi
 
@@ -13016,7 +13016,7 @@ else
 
 LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
 LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)"
- LIBMPDEC_INTERNAL="\$(LIBMPDEC_A)"
+ LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)"
 
 if test "x$with_pydebug" = xyes; then :
 
diff --git a/configure.ac b/configure.ac
index c8e227a81d2a..7a9b16407c61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3699,7 +3699,7 @@ AS_VAR_IF([with_system_expat], [yes], [
 ], [
 LIBEXPAT_CFLAGS="-I\$(srcdir)/Modules/expat"
 LIBEXPAT_LDFLAGS="-lm \$(LIBEXPAT_A)"
- LIBEXPAT_INTERNAL="\$(LIBEXPAT_A)"
+ LIBEXPAT_INTERNAL="\$(LIBEXPAT_HEADERS) \$(LIBEXPAT_A)"
 ])
 
 AC_SUBST([LIBEXPAT_CFLAGS])
@@ -3808,7 +3808,7 @@ AS_VAR_IF([with_system_libmpdec], [yes], [
 ], [
 LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
 LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)"
- LIBMPDEC_INTERNAL="\$(LIBMPDEC_A)"
+ LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)"
 
 dnl Disable forced inlining in debug builds, see GH-94847
 AS_VAR_IF([with_pydebug], [yes], [
