[2.7] closes bpo-35139: The `pyexpat` module's macros in `Modules/Setup` now match...

This could cause compile errors on macOS or other platforms..
(cherry picked from commit 318ab63c01f5b8e7562b122ab5ba01258a51277b)

Co-authored-by: Max Bélanger <aeromax@gmail.com>

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
+++ b/Misc/NEWS.d/next/Build/2018-11-01-15-01-23.bpo-35139.XZTttb.rst
@@ -0,0 +1 @@
+Fix a compiler error when statically linking `pyexpat` in `Modules/Setup`.

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index bd8b52e1de235e98b451bbfff8fe35b0219b1772..bbc9222129641bb02d3427f9eb5212c6a7b38cb6 100644 (file)
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -469,7 +469,7 @@ GLHACK=-Dclear=__GLclear
 # 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