]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
closes bpo-35139: The `pyexpat` module's macros in `Modules/Setup` now match `setup...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Fri, 2 Nov 2018 03:32:29 +0000 (20:32 -0700)
committerGitHub <noreply@github.com>
Fri, 2 Nov 2018 03:32:29 +0000 (20:32 -0700)
This could cause compile errors on macOS or other platforms.
(cherry picked from commit 318ab63c01f5b8e7562b122ab5ba01258a51277b)

Co-authored-by: Max Bélanger <aeromax@gmail.com>
Misc/NEWS.d/next/Build/2018-11-01-15-01-23.bpo-35139.XZTttb.rst [new file with mode: 0644]
Modules/Setup.dist

diff --git a/Misc/NEWS.d/next/Build/2018-11-01-15-01-23.bpo-35139.XZTttb.rst b/Misc/NEWS.d/next/Build/2018-11-01-15-01-23.bpo-35139.XZTttb.rst
new file mode 100644 (file)
index 0000000..aa65088
--- /dev/null
@@ -0,0 +1 @@
+Fix a compiler error when statically linking `pyexpat` in `Modules/Setup`.
index acf4433cfe6fb60c603ae604de6c25fcd0dc155f..e469d5e4c8e88c3af118d9f0572a8cc50c6c57e6 100644 (file)
@@ -368,7 +368,7 @@ _symtable symtablemodule.c
 # Interface to the Expat XML parser
 # More information on Expat can be found at www.libexpat.org.
 #
-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI
+#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY=1 -DUSE_PYEXPAT_CAPI
 
 # Hye-Shik Chang's CJKCodecs