802ac5ba5a
Update libraries to match VFX platform 2024, and a few other upgrades to latest versions. boost 1.82.0 deflate 1.18 (new) ffi 3.4.4 freeglut (deleted) ispc 1.12.1 llvm 17.0.6 materialx 1.38.8 mesa 23.3.0 numpy 1.24.3 opencolorio 2.3.0 openexr 3.2.1 openimageio 2.5.6.0 opensubdiv 3.6.0 openvdb 11.0.0 osl 1.13.5.0 (now dynamic) python 3.11.6 sqlite 3.42.0 sse2neon 0d6e9b3dd4 usd 23.11 vulkan 1.3.270 xm2 2.12.3 This only updates the build scripts, the precompiled libraries for each platform will land over the coming weeks. Ref #113157 Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Campbell Barton <campbell@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/116420
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
diff --git a/setup.py.orig b/setup.py
|
|
index a97a755..07ce853 100644
|
|
--- a/setup.py.orig
|
|
+++ b/setup.py
|
|
@@ -2168,7 +2168,7 @@
|
|
ffi_inc = None
|
|
print('Header file {} does not exist'.format(ffi_h))
|
|
if ffi_lib is None and ffi_inc:
|
|
- for lib_name in ('ffi', 'ffi_pic'):
|
|
+ for lib_name in ('ffi_pic', ):
|
|
if (self.compiler.find_library_file(self.lib_dirs, lib_name)):
|
|
ffi_lib = lib_name
|
|
break
|
|
--- a/Modules/posixmodule.c 2022-12-09 21:44:03
|
|
+++ b/Modules/posixmodule.c 2022-12-09 21:39:46
|
|
@@ -10564,10 +10564,15 @@
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef HAVE_MKFIFOAT
|
|
if (dir_fd != DEFAULT_DIR_FD) {
|
|
+// BLENDER: disable also at compile time for compatibility when linking with older Xcode.
|
|
+// https://github.com/python/cpython/issues/97897
|
|
+#ifndef __APPLE__
|
|
if (HAVE_MKFIFOAT_RUNTIME) {
|
|
result = mkfifoat(dir_fd, path->narrow, mode);
|
|
|
|
+ } else
|
|
+#endif
|
|
+ {
|
|
- } else {
|
|
mkfifoat_unavailable = 1;
|
|
result = 0;
|
|
}
|
|
@@ -10638,10 +10633,15 @@
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef HAVE_MKNODAT
|
|
if (dir_fd != DEFAULT_DIR_FD) {
|
|
+// BLENDER: disable also at compile time for compatibility when linking with older Xcode.
|
|
+// https://github.com/python/cpython/issues/97897
|
|
+#ifndef __APPLE__
|
|
if (HAVE_MKNODAT_RUNTIME) {
|
|
result = mknodat(dir_fd, path->narrow, mode, device);
|
|
|
|
+ } else
|
|
+#endif
|
|
+ {
|
|
- } else {
|
|
mknodat_unavailable = 1;
|
|
result = 0;
|
|
}
|