Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-28 07:49:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-all: always apply tr1 removal patch

Browse Source 
Just to use consistent patches between the builds. It was previously guarded by `WASM`, but it was a dead code - `OpenCOLLADA` is skipped on wasm, so it was never exercised.

Regarding the "specializing std::hash outside of the std:: namespace" issue on gcc - it was caused by patch missing fixes for `COLLADABU_HASH_NAMESPACE_OPEN` and `COLLADABU_HASH_NAMESPACE_CLOSE`. So in theory it should have also result in an error in clang or in an invalid code/ub. Either way, now it's fixed.
This commit is contained in:
Andrej730
2026-08-27 17:07:08 +05:00
parent ec0e0ab3ff
commit 57eb5f474e
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+1 -7
View File
@@ -1285,13 +1285,7 @@ if "OpenCOLLADA" in targets:
# OpenCOLLADAConfig.cmake.in hardcodes shared-lib targets on Unix regardless of # OpenCOLLADAConfig.cmake.in hardcodes shared-lib targets on Unix regardless of
# whether shared libs were actually built. We make it follow `USE_SHARED` instead. # whether shared libs were actually built. We make it follow `USE_SHARED` instead.
patches.append("./patches/opencollada/config_select_libs_by_use_shared.patch") patches.append("./patches/opencollada/config_select_libs_by_use_shared.patch")
patches.append("./patches/opencollada/remove_tr1.patch")
if WASM:
# 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",
nix/patches/opencollada/remove_tr1.patch
+8 -4
View File
@@ -27,11 +27,13 @@ index 8ab0fb9b..12503bfb 100644
- #define COLLADABU_HASH_MAP std::tr1::unordered_map - #define COLLADABU_HASH_MAP std::tr1::unordered_map
- #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap - #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap
- #define COLLADABU_HASH_SET std::tr1::unordered_set - #define COLLADABU_HASH_SET std::tr1::unordered_set
- #define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
- #define COLLADABU_HASH_NAMESPACE_CLOSE }
+ #define COLLADABU_HASH_MAP std::unordered_map + #define COLLADABU_HASH_MAP std::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::unordered_multimap + #define COLLADABU_HASH_MULTIMAP std::unordered_multimap
+ #define COLLADABU_HASH_SET std::unordered_set + #define COLLADABU_HASH_SET std::unordered_set
#define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1 + #define COLLADABU_HASH_NAMESPACE_OPEN std
#define COLLADABU_HASH_NAMESPACE_CLOSE } + #define COLLADABU_HASH_NAMESPACE_CLOSE
#define COLLADABU_HASH_FUN hash #define COLLADABU_HASH_FUN hash
@@ -107,12 +107,12 @@ @@ -107,12 +107,12 @@
#define COLLADABU_HASH_NAMESPACE_CLOSE #define COLLADABU_HASH_NAMESPACE_CLOSE
@@ -45,11 +47,13 @@ index 8ab0fb9b..12503bfb 100644
- #define COLLADABU_HASH_MAP std::tr1::unordered_map - #define COLLADABU_HASH_MAP std::tr1::unordered_map
- #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap - #define COLLADABU_HASH_MULTIMAP std::tr1::unordered_multimap
- #define COLLADABU_HASH_SET std::tr1::unordered_set - #define COLLADABU_HASH_SET std::tr1::unordered_set
- #define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1
- #define COLLADABU_HASH_NAMESPACE_CLOSE }
+ #define COLLADABU_HASH_MAP std::unordered_map + #define COLLADABU_HASH_MAP std::unordered_map
+ #define COLLADABU_HASH_MULTIMAP std::unordered_multimap + #define COLLADABU_HASH_MULTIMAP std::unordered_multimap
+ #define COLLADABU_HASH_SET std::unordered_set + #define COLLADABU_HASH_SET std::unordered_set
#define COLLADABU_HASH_NAMESPACE_OPEN std { namespace tr1 + #define COLLADABU_HASH_NAMESPACE_OPEN std
#define COLLADABU_HASH_NAMESPACE_CLOSE } + #define COLLADABU_HASH_NAMESPACE_CLOSE
#define COLLADABU_HASH_FUN hash #define COLLADABU_HASH_FUN hash
diff --git a/common/libBuffer/include/CommonFWriteBufferFlusher.h b/common/libBuffer/include/CommonFWriteBufferFlusher.h diff --git a/common/libBuffer/include/CommonFWriteBufferFlusher.h b/common/libBuffer/include/CommonFWriteBufferFlusher.h
index c7af45b2..fac4f133 100644 index c7af45b2..fac4f133 100644