diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-25 17:37:55 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-08-07 18:54:26 +0300 |
| commit | 3c14f02eac36cccd280d9531cc3fd148526aedf9 (patch) | |
| tree | a9180f4e5fd09d9b83f9f31b7f67bb3ab91bb01d /build_files/build_environment/patches/python_apple.diff | |
| parent | fc38276d74e1d451663c70f82e7f54293d24bbe4 (diff) | |
Build: add scripts to build dependencies for Windows and macOS.
Note these are intended for platform maintainers, we do not intend to
support users making their own builds with these. For that precompiled
libraries from lib/ should be used.
Implemented by Martijn Berger, Ray Molenkamp and Brecht Van Lommel.
Differential Revision: https://developer.blender.org/D2753
Diffstat (limited to 'build_files/build_environment/patches/python_apple.diff')
| -rw-r--r-- | build_files/build_environment/patches/python_apple.diff | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/python_apple.diff b/build_files/build_environment/patches/python_apple.diff new file mode 100644 index 00000000000..0ca7a8d8f04 --- /dev/null +++ b/build_files/build_environment/patches/python_apple.diff @@ -0,0 +1,48 @@ +--- 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 +@@ -119,12 +119,6 @@ + /* Define to 1 if you have the `clock' function. */ + #undef HAVE_CLOCK + +-/* Define to 1 if you have the `clock_getres' function. */ +-#undef HAVE_CLOCK_GETRES +- +-/* 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 + +@@ -338,9 +332,6 @@ + /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */ + #undef HAVE_GETC_UNLOCKED + +-/* Define to 1 if you have the `getentropy' function. */ +-#undef HAVE_GETENTROPY +- + /* Define to 1 if you have the `getgrouplist' function. */ + #undef HAVE_GETGROUPLIST + |