Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-17 22:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing MacOS builds

Browse Source
This commit is contained in:
Dion Moult
2024-10-10 21:12:31 +11:00
parent 766f8adce7
commit 10e76a09de
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/Makefile
+6 -6
View File
@@ -274,11 +274,6 @@ endif
# See: https://projects.blender.org/blender/blender/issues/125091 # See: https://projects.blender.org/blender/blender/issues/125091
ifeq ($(PLATFORM), macosm1) ifeq ($(PLATFORM), macosm1)
# Has universal and x86_64 builds.
prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \
whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
mv "$$prev_whl_name" "$$whl_name";
# Has universal and x86_64 builds. # Has universal and x86_64 builds.
prev_whl_name=$$(find build/bonsai/wheels/lxml-*.whl); \ prev_whl_name=$$(find build/bonsai/wheels/lxml-*.whl); \
whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \ whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_arm64/"); \
@@ -294,6 +289,11 @@ ifeq ($(PLATFORM), macosm1)
mv "$$prev_whl_name" "$$whl_name"; mv "$$prev_whl_name" "$$whl_name";
endif endif
ifeq ($(PLATFORM), macos) ifeq ($(PLATFORM), macos)
# Has universal and arm64 builds.
prev_whl_name=$$(find build/bonsai/wheels/MarkupSafe-*.whl); \
whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
mv "$$prev_whl_name" "$$whl_name";
prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \ prev_whl_name=$$(find build/bonsai/wheels/tzfpy-*.whl); \
whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \ whl_name=$$(echo $$prev_whl_name | sed -E "s/macosx_10_([0-9]+)_x86_64\.macosx_11_0_arm64\.macosx_10_\1_universal2/macosx_10_\1_x86_64/"); \
mv "$$prev_whl_name" "$$whl_name"; mv "$$prev_whl_name" "$$whl_name";
@@ -302,7 +302,7 @@ ifeq ($(PLATFORM), macos)
whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \ whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
mv "$$prev_whl_name" "$$whl_name"; mv "$$prev_whl_name" "$$whl_name";
# has universal and amr64 builds. # has universal and arm builds.
prev_whl_name=$$(find build/bonsai/wheels/fonttools-*.whl); \ prev_whl_name=$$(find build/bonsai/wheels/fonttools-*.whl); \
whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \ whl_name=$$(echo $$prev_whl_name | sed "s/_universal2/_x86_64/"); \
mv "$$prev_whl_name" "$$whl_name"; mv "$$prev_whl_name" "$$whl_name";