From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 11 Jun 2019 02:15:24 +0000 (-0700) Subject: closes bpo-35184: Fix XML_POOR_ENTROPY option that breaks makesetup parsing of pyexpa... X-Git-Tag: v3.7.4rc1~42 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30fd7a476bbd6bb8096c1349698463fa8a3bca18;p=thirdparty%2FPython%2Fcpython.git closes bpo-35184: Fix XML_POOR_ENTROPY option that breaks makesetup parsing of pyexpat line in Setup. (GH-13064) When the line is uncommented, the equals character causes it to be incorrectly interpreted as a macro definition by makesetup. This results in invalid Makefile output. The expat code only requires XML_POOR_ENTROPY to be defined; the value is unnecessary. (cherry picked from commit 408a2ef1aceff1f4270c44552fa39ef93d9283e3) Co-authored-by: aaronpaulhurst --- diff --git a/Modules/Setup.dist b/Modules/Setup.dist index 8cc6bf0540d4..344e03ada990 100644 --- a/Modules/Setup.dist +++ b/Modules/Setup.dist @@ -340,7 +340,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 -DXML_POOR_ENTROPY=1 -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 -DUSE_PYEXPAT_CAPI # Hye-Shik Chang's CJKCodecs