Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eac1a63

Browse files
erlend-aaslandhroncok
andauthoredNov 13, 2022
[3.11] gh-98707: configure --with-system-libmpdec and --with-system-expat no longer include vendored headers (GH-98711) (#99391)
(cherry picked from commit 6abec1c) Co-authored-by: Miro Hrončok <miro@hroncok.cz>
1 parent edf7449 commit eac1a63

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed
 

‎Makefile.pre.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -2528,12 +2528,12 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
25282528

25292529
MODULE_CMATH_DEPS=$(srcdir)/Modules/_math.h
25302530
MODULE_MATH_DEPS=$(srcdir)/Modules/_math.h
2531-
MODULE_PYEXPAT_DEPS=$(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
2531+
MODULE_PYEXPAT_DEPS=@LIBEXPAT_INTERNAL@
25322532
MODULE_UNICODEDATA_DEPS=$(srcdir)/Modules/unicodedata_db.h $(srcdir)/Modules/unicodename_db.h
25332533
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
25342534
MODULE__CTYPES_DEPS=$(srcdir)/Modules/_ctypes/ctypes.h
2535-
MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h $(LIBMPDEC_HEADERS) @LIBMPDEC_INTERNAL@
2536-
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c $(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
2535+
MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h @LIBMPDEC_INTERNAL@
2536+
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c @LIBEXPAT_INTERNAL@
25372537
MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h
25382538
MODULE__IO_DEPS=$(srcdir)/Modules/_io/_iomodule.h
25392539
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Don't use vendored ``libmpdec`` headers if :option:`--with-system-libmpdec`
2+
is passed to :program:`configure`.
3+
Don't use vendored ``libexpat`` headers if :option:`--with-system-expat`
4+
is passed to :program:`!configure`.

‎configure

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -3610,7 +3610,7 @@ AS_VAR_IF([with_system_expat], [yes], [
36103610
], [
36113611
LIBEXPAT_CFLAGS="-I\$(srcdir)/Modules/expat"
36123612
LIBEXPAT_LDFLAGS="-lm \$(LIBEXPAT_A)"
3613-
LIBEXPAT_INTERNAL="\$(LIBEXPAT_A)"
3613+
LIBEXPAT_INTERNAL="\$(LIBEXPAT_HEADERS) \$(LIBEXPAT_A)"
36143614
])
36153615

36163616
AC_SUBST([LIBEXPAT_CFLAGS])
@@ -3666,7 +3666,7 @@ AS_VAR_IF([with_system_libmpdec], [yes], [
36663666
], [
36673667
LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
36683668
LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)"
3669-
LIBMPDEC_INTERNAL="\$(LIBMPDEC_A)"
3669+
LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)"
36703670
36713671
dnl Disable forced inlining in debug builds, see GH-94847
36723672
AS_VAR_IF([with_pydebug], [yes], [

0 commit comments

Comments
 (0)
Please sign in to comment.