diff options
Diffstat (limited to 'build_files/build_environment/patches/python_apple.diff')
| -rw-r--r-- | build_files/build_environment/patches/python_apple.diff | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/build_files/build_environment/patches/python_apple.diff b/build_files/build_environment/patches/python_apple.diff index 0ca7a8d8f04..34a7906ed6c 100644 --- a/build_files/build_environment/patches/python_apple.diff +++ b/build_files/build_environment/patches/python_apple.diff @@ -1,28 +1,5 @@ ---- Modules/expat/expat_external.h 2016-12-17 06:51:30 -0500 -+++ Modules/expat/expat_external.h 2016-12-17 06:55:29 -0500 -@@ -7,9 +7,17 @@ - - /* External API definitions */ - --/* Namespace external symbols to allow multiple libexpat version to -- co-exist. */ --#include "pyexpatns.h" -+/* -+ -+ 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. -+ -+*/ - - #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) - #define XML_USE_MSC_EXTENSIONS 1 ---- pyconfig.h.in 2017-04-05 02:47:52.000000000 +0200 -+++ pyconfig.h.in 2017-04-05 02:51:33.000000000 +0200 +--- pyconfig.h.in 2017-09-19 14:41:01.000000000 +0300 ++++ pyconfig.h.in 2017-09-19 14:43:18.000000000 +0300 @@ -119,12 +119,6 @@ /* Define to 1 if you have the `clock' function. */ #undef HAVE_CLOCK @@ -33,10 +10,10 @@ -/* Define to 1 if you have the `clock_gettime' function. */ -#undef HAVE_CLOCK_GETTIME - - /* Define if the C compiler supports computed gotos. */ - #undef HAVE_COMPUTED_GOTOS + /* Define to 1 if you have the `clock_settime' function. */ + #undef HAVE_CLOCK_SETTIME -@@ -338,9 +332,6 @@ +@@ -369,9 +363,6 @@ /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */ #undef HAVE_GETC_UNLOCKED |