From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 2 Nov 2018 03:32:29 +0000 (-0700)
Subject: closes bpo-35139: The `pyexpat` module's macros in `Modules/Setup` now match `setup... 
X-Git-Tag: v3.6.8rc1~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2339fe7cad9a84815fe551fedd6acdc3f2bf0a64;p=thirdparty%2FPython%2Fcpython.git

closes bpo-35139: The `pyexpat` module's macros in `Modules/Setup` now match `setup.py` (GH-10289)


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
index 000000000000..aa65088be809
--- /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 acf4433cfe6f..e469d5e4c8e8 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -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