Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 14:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build-all collada compile on gcc 9.4.0

Browse Source
This commit is contained in:
Thomas Krijnen
2022-12-28 13:33:16 +01:00
parent 599c391407
commit 6180d73f75
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+10 -1
View File
@@ -603,6 +603,15 @@ if "libxml2" in targets:
) )
if "OpenCOLLADA" in targets: if "OpenCOLLADA" in targets:
patches = ["./patches/opencollada/pr622_and_disable_subdirs.patch"]
if "wasm" in flags:
# This is necessary for the WASM build, because recent versions of
# clang don't have the tr1:: namespace anymore. However, it breaks
# some versions of gcc (9.4.0 at least) due to specializing std::hash
# outside of the std:: namespace.
patches.append("./patches/opencollada/remove_tr1.patch")
build_dependency( build_dependency(
"OpenCOLLADA", "OpenCOLLADA",
"cmake", "cmake",
@@ -617,7 +626,7 @@ if "OpenCOLLADA" in targets:
download_url="https://github.com/KhronosGroup/OpenCOLLADA.git", download_url="https://github.com/KhronosGroup/OpenCOLLADA.git",
download_name="OpenCOLLADA", download_name="OpenCOLLADA",
download_tool=download_tool_git, download_tool=download_tool_git,
patch=("./patches/opencollada/pr622_and_disable_subdirs.patch", "./patches/opencollada/remove_tr1.patch"), patch=patches,
revision=OPENCOLLADA_VERSION revision=OPENCOLLADA_VERSION
) )