8000 gh-98707: configure --with-system-libmpdec and --with-system-expat no… · python/cpython@6abec1c · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6abec1c

Browse files
hroncokhroncok
authored
gh-98707: configure --with-system-libmpdec and --with-system-expat no longer include vendored headers (#98711)
1 parent 8fe1a88 commit 6abec1c

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

‎Makefile.pre.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,13 +2588,13 @@ MODULE_DEPS=$(PYTHON_HEADERS) Modules/config.c $(EXPORTSYMS)
25882588

25892589
MODULE_CMATH_DEPS=$(srcdir)/Modules/_math.h
25902590
MODULE_MATH_DEPS=$(srcdir)/Modules/_math.h
2591-
MODULE_PYEXPAT_DEPS=$(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
2591+
MODULE_PYEXPAT_DEPS=@LIBEXPAT_INTERNAL@
25922592
MODULE_UNICODEDATA_DEPS=$(srcdir)/Modules/unicodedata_db.h $(srcdir)/Modules/unicodename_db.h
25932593
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
25942594
MODULE__CTYPES_DEPS=$(srcdir)/Modules/_ctypes/ctypes.h $(srcdir)/Modules/_ctypes/darwin/dlfcn.h
25952595
MODULE__CTYPES_MALLOC_CLOSURE=@MODULE__CTYPES_MALLOC_CLOSURE@
2596-
MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h $(LIBMPDEC_HEADERS) @LIBMPDEC_INTERNAL@
2597-
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c $(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
2596+
MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h @LIBMPDEC_INTERNAL@
2597+
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c @LIBEXPAT_INTERNAL@
25982598
MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h
25992599
MODULE__IO_DEPS=$(srcdir)/Modules/_io/_iomodule.h
26002600
MODULE__MD5_DEPS=$(srcdir)/Modules/hashlib.h

‎Misc/NEWS.d/next/Build/2022-10-26-12-37-52.gh-issue-98707.eVXGEx.rst

Lines changed: 4 additions & 0 deletions
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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3699,7 +3699,7 @@ AS_VAR_IF([with_system_expat], [yes], [
36993699
], [
37003700
LIBEXPAT_CFLAGS="-I\$(srcdir)/Modules/expat"
37013701
LIBEXPAT_LDFLAGS="-lm \$(LIBEXPAT_A)"
3702-
LIBEXPAT_INTERNAL="\$(LIBEXPAT_A)"
3702+
LIBEXPAT_INTERNAL="\$(LIBEXPAT_HEADERS) \$(LIBEXPAT_A)"
37033703
])
37043704

37053705
AC_SUBST([LIBEXPAT_CFLAGS])
@@ -3808,7 +3808,7 @@ AS_VAR_IF([with_system_libmpdec], [yes], [
38083808
], [
38093809
LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
38103810
LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)"
3811-
LIBMPDEC_INTERNAL="\$(LIBMPDEC_A)"
3811+
LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)"
38123812
38133813
dnl Disable forced inlining in debug builds, see GH-94847
38143814
AS_VAR_IF([with_pydebug], [yes], [

0 commit comments

Comments
 (0)
0