[2.7] closes bpo-35139: The pyexpat module's macros in Modules/Setup now match setup.py (GH-10293)

benjaminp · maxbelanger · web-flow · commit a614cc92088c · 2018-11-01T20:28:34.000-07:00
This could cause compile errors on macOS or other platforms.. (cherry picked from commit 318ab63) 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
@@ -0,0 +1 @@
+Fix a compiler error when statically linking `pyexpat` in `Modules/Setup`.
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix a compiler error when statically linking `pyexpat` in `Modules/Setup`.
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ GLHACK=-Dclear=__GLclear`
`469`	`469`	`# Interface to the Expat XML parser`
`470`	`470`	`# More information on Expat can be found at www.libexpat.org.`
`471`	`471`	`#`
`472`		`-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI`
	`472`	`+#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`
`473`	`473`
`474`	`474`
`475`	`475`	`# Hye-Shik Chang's CJKCodecs`