diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-10-11 12:14:56 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-10-11 12:14:56 +0300 |
| commit | 7c9733e7e41984cbb95c7c8f3e369dc0f82e64bd (patch) | |
| tree | 430a72722a635f348bfee8ef12ed021d7a131489 | |
| parent | 530134a0020ca96f31e6f4b16327376fd4f7c9bc (diff) | |
Remove numpy patch, as it no longer applies; the option it tries to disable seems to have been removed from numpy.
| -rw-r--r-- | build_files/build_environment/cmake/numpy.cmake | 1 | ||||
| -rw-r--r-- | build_files/build_environment/patches/numpy.diff | 27 |
2 files changed, 0 insertions, 28 deletions
diff --git a/build_files/build_environment/cmake/numpy.cmake b/build_files/build_environment/cmake/numpy.cmake index 73fa6e75556..1b58fd6aee9 100644 --- a/build_files/build_environment/cmake/numpy.cmake +++ b/build_files/build_environment/cmake/numpy.cmake @@ -38,7 +38,6 @@ ExternalProject_Add(external_numpy PREFIX ${BUILD_DIR}/numpy PATCH_COMMAND ${NUMPY_PATCH} CONFIGURE_COMMAND "" - PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff LOG_BUILD 1 BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable INSTALL_COMMAND "" diff --git a/build_files/build_environment/patches/numpy.diff b/build_files/build_environment/patches/numpy.diff deleted file mode 100644 index a9b783dd856..00000000000 --- a/build_files/build_environment/patches/numpy.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index ba2b1f4..b10f7df 100644 ---- a/numpy/distutils/system_info.py -+++ b/numpy/distutils/system_info.py -@@ -2164,8 +2164,8 @@ class accelerate_info(system_info): - 'accelerate' in libraries): - if intel: - args.extend(['-msse3']) -- else: -- args.extend(['-faltivec']) -+# else: -+# args.extend(['-faltivec']) - args.extend([ - '-I/System/Library/Frameworks/vecLib.framework/Headers']) - link_args.extend(['-Wl,-framework', '-Wl,Accelerate']) -@@ -2174,8 +2174,8 @@ class accelerate_info(system_info): - 'veclib' in libraries): - if intel: - args.extend(['-msse3']) -- else: -- args.extend(['-faltivec']) -+# else: -+# args.extend(['-faltivec']) - args.extend([ - '-I/System/Library/Frameworks/vecLib.framework/Headers']) - link_args.extend(['-Wl,-framework', '-Wl,vecLib']) - |