archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
c5b56a525cd6113caa2bd3ec7bfb91fe4a04513a
blender-archive/build_files/build_environment/patches/python_unix.diff

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

39 lines
1.6 KiB
Diff
Raw Normal View History

Build environment: Make sure Python is linkign against static Zlib There is system-wide libz development package installed by default, needed for some other dependencies. This patch ensures Python will use our own self-compiled Zlib.
2018-08-28 18:28:05 +02:00
diff --git a/setup.py.orig b/setup.py
Build environment: Ensure Python is using static ffi Surely, need to compile ffi first :) Good news are: Python seems static enough now!
2018-08-28 18:53:59 +02:00
index a97a755..07ce853 100644
Build environment: Make sure Python is linkign against static Zlib There is system-wide libz development package installed by default, needed for some other dependencies. This patch ensures Python will use our own self-compiled Zlib.
2018-08-28 18:28:05 +02:00
--- a/setup.py.orig
+++ b/setup.py
cmake/deps: update Python to 3.9.1 The following packages also have received updates: - IDNA 2.10 - CHARDET 4.0.0 - URLLIB3 1.26.3 - CERTIFI 2020.12.5 - REQUESTS 2.25.1 - NUMPY 1.19.5 numpy has gained a hard dependency on cython: - CYTHON 0.29.21 Notes: - This only updates the build environment files, once these are built, Blender can default to Python 3.9. - The 'm' suffix for Python binaries/libs has been removed. - The macOS patch in Python 3.7 is has been removed. Reviewed By: sybren, campbellbarton, sebbas Ref D10257
2021-02-10 09:24:47 +11:00
@@ -1603,13 +1603,13 @@
Build environment: Make sure Python is linkign against static Zlib There is system-wide libz development package installed by default, needed for some other dependencies. This patch ensures Python will use our own self-compiled Zlib.
2018-08-28 18:28:05 +02:00
version = line.split()[2]
break
if version >= version_req:
cmake/deps: update Python to 3.9.1 The following packages also have received updates: - IDNA 2.10 - CHARDET 4.0.0 - URLLIB3 1.26.3 - CERTIFI 2020.12.5 - REQUESTS 2.25.1 - NUMPY 1.19.5 numpy has gained a hard dependency on cython: - CYTHON 0.29.21 Notes: - This only updates the build environment files, once these are built, Blender can default to Python 3.9. - The 'm' suffix for Python binaries/libs has been removed. - The macOS patch in Python 3.7 is has been removed. Reviewed By: sybren, campbellbarton, sebbas Ref D10257
2021-02-10 09:24:47 +11:00
- if (self.compiler.find_library_file(self.lib_dirs, 'z')):
+ if (self.compiler.find_library_file(self.lib_dirs, 'z_pic')):
if MACOS:
Build environment: Make sure Python is linkign against static Zlib There is system-wide libz development package installed by default, needed for some other dependencies. This patch ensures Python will use our own self-compiled Zlib.
2018-08-28 18:28:05 +02:00
zlib_extra_link_args = ('-Wl,-search_paths_first',)
else:
zlib_extra_link_args = ()
cmake/deps: update Python to 3.9.1 The following packages also have received updates: - IDNA 2.10 - CHARDET 4.0.0 - URLLIB3 1.26.3 - CERTIFI 2020.12.5 - REQUESTS 2.25.1 - NUMPY 1.19.5 numpy has gained a hard dependency on cython: - CYTHON 0.29.21 Notes: - This only updates the build environment files, once these are built, Blender can default to Python 3.9. - The 'm' suffix for Python binaries/libs has been removed. - The macOS patch in Python 3.7 is has been removed. Reviewed By: sybren, campbellbarton, sebbas Ref D10257
2021-02-10 09:24:47 +11:00
self.add(Extension('zlib', ['zlibmodule.c'],
- libraries=['z'],
+ libraries=['z_pic'],
extra_link_args=zlib_extra_link_args))
Build environment: Make sure Python is linkign against static Zlib There is system-wide libz development package installed by default, needed for some other dependencies. This patch ensures Python will use our own self-compiled Zlib.
2018-08-28 18:28:05 +02:00
have_zlib = True
else:
cmake/deps: update Python to 3.9.1 The following packages also have received updates: - IDNA 2.10 - CHARDET 4.0.0 - URLLIB3 1.26.3 - CERTIFI 2020.12.5 - REQUESTS 2.25.1 - NUMPY 1.19.5 numpy has gained a hard dependency on cython: - CYTHON 0.29.21 Notes: - This only updates the build environment files, once these are built, Blender can default to Python 3.9. - The 'm' suffix for Python binaries/libs has been removed. - The macOS patch in Python 3.7 is has been removed. Reviewed By: sybren, campbellbarton, sebbas Ref D10257
2021-02-10 09:24:47 +11:00
@@ -1623,7 +1623,7 @@
Build environment: Make sure Python is linkign against static Zlib There is system-wide libz development package installed by default, needed for some other dependencies. This patch ensures Python will use our own self-compiled Zlib.
2018-08-28 18:28:05 +02:00
# crc32 if we have it. Otherwise binascii uses its own.
if have_zlib:
extra_compile_args = ['-DUSE_ZLIB_CRC32']
- libraries = ['z']
+ libraries = ['z_pic']
extra_link_args = zlib_extra_link_args
else:
extra_compile_args = []
cmake/deps: update Python to 3.9.1 The following packages also have received updates: - IDNA 2.10 - CHARDET 4.0.0 - URLLIB3 1.26.3 - CERTIFI 2020.12.5 - REQUESTS 2.25.1 - NUMPY 1.19.5 numpy has gained a hard dependency on cython: - CYTHON 0.29.21 Notes: - This only updates the build environment files, once these are built, Blender can default to Python 3.9. - The 'm' suffix for Python binaries/libs has been removed. - The macOS patch in Python 3.7 is has been removed. Reviewed By: sybren, campbellbarton, sebbas Ref D10257
2021-02-10 09:24:47 +11:00
@@ -2168,7 +2168,7 @@
ffi_inc = None
Build environment: Ensure Python is using static ffi Surely, need to compile ffi first :) Good news are: Python seems static enough now!
2018-08-28 18:53:59 +02:00
print('Header file {} does not exist'.format(ffi_h))
cmake/deps: update Python to 3.9.1 The following packages also have received updates: - IDNA 2.10 - CHARDET 4.0.0 - URLLIB3 1.26.3 - CERTIFI 2020.12.5 - REQUESTS 2.25.1 - NUMPY 1.19.5 numpy has gained a hard dependency on cython: - CYTHON 0.29.21 Notes: - This only updates the build environment files, once these are built, Blender can default to Python 3.9. - The 'm' suffix for Python binaries/libs has been removed. - The macOS patch in Python 3.7 is has been removed. Reviewed By: sybren, campbellbarton, sebbas Ref D10257
2021-02-10 09:24:47 +11:00
if ffi_lib is None and ffi_inc:
Build environment: Ensure Python is using static ffi Surely, need to compile ffi first :) Good news are: Python seems static enough now!
2018-08-28 18:53:59 +02:00
- for lib_name in ('ffi', 'ffi_pic'):
+ for lib_name in ('ffi_pic', ):
cmake/deps: update Python to 3.9.1 The following packages also have received updates: - IDNA 2.10 - CHARDET 4.0.0 - URLLIB3 1.26.3 - CERTIFI 2020.12.5 - REQUESTS 2.25.1 - NUMPY 1.19.5 numpy has gained a hard dependency on cython: - CYTHON 0.29.21 Notes: - This only updates the build environment files, once these are built, Blender can default to Python 3.9. - The 'm' suffix for Python binaries/libs has been removed. - The macOS patch in Python 3.7 is has been removed. Reviewed By: sybren, campbellbarton, sebbas Ref D10257
2021-02-10 09:24:47 +11:00
if (self.compiler.find_library_file(self.lib_dirs, lib_name)):
Build environment: Ensure Python is using static ffi Surely, need to compile ffi first :) Good news are: Python seems static enough now!
2018-08-28 18:53:59 +02:00
ffi_lib = lib_name
break
Copy Permalink