From 6180d73f75bdf8ce9e7e4d61626a024736bc5d0b Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Wed, 28 Dec 2022 13:33:16 +0100 Subject: [PATCH] Fix build-all collada compile on gcc 9.4.0 --- nix/build-all.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nix/build-all.py b/nix/build-all.py index a856f61ccb..0e65471279 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -603,6 +603,15 @@ if "libxml2" 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( "OpenCOLLADA", "cmake", @@ -617,7 +626,7 @@ if "OpenCOLLADA" in targets: download_url="https://github.com/KhronosGroup/OpenCOLLADA.git", download_name="OpenCOLLADA", download_tool=download_tool_git, - patch=("./patches/opencollada/pr622_and_disable_subdirs.patch", "./patches/opencollada/remove_tr1.patch"), + patch=patches, revision=OPENCOLLADA_VERSION )