147cb6a2ae
3.5 release is needed for MSVC 14.0 (aka VS 2015) support. Python 3.5 removed build toolchain support for MSVC 2013. Because we still need to support it, we duplicate the Python directory in externals and copy old patches and dispatch to this directory for MSVC 2013. Once the support for MSVC 2013 is dropped on master, this directory can be removed again. Change-Id: Idf7bc351239582f583ecbdb53c923cbdcf968089 Reviewed-on: https://gerrit.libreoffice.org/17352 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
28 lines
855 B
Groff
28 lines
855 B
Groff
HACK: Fix build breakage on MacOS:
|
|
|
|
*** WARNING: renaming "pyexpat" since importing it failed: dlopen(build/lib.macosx-10.6-i386-3.3/pyexpat.so, 2): Symbol not found: _XML_ErrorString
|
|
|
|
This reverts c242a8f30806 from the python hg repo:
|
|
|
|
restore namespacing of pyexpat symbols (closes #19186)
|
|
|
|
|
|
See http://bugs.python.org/issue19186#msg214069
|
|
|
|
The recommendation to include Modules/inc at first broke the Linux build...
|
|
|
|
So do it this way, as it was before. Needs some realignment later.
|
|
|
|
--- python3/Modules/expat/expat_external.h
|
|
+++ python3/Modules/expat/expat_external.h
|
|
@@ -7,10 +7,6 @@
|
|
|
|
/* External API definitions */
|
|
|
|
-/* Namespace external symbols to allow multiple libexpat version to
|
|
- co-exist. */
|
|
-#include "pyexpatns.h"
|
|
-
|
|
#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
|
|
#define XML_USE_MSC_EXTENSIONS 1
|
|
#endif
|