From bb4b7dae520766907b802d83b39a9cd98837c802 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Tue, 23 Sep 2025 15:34:09 +0500 Subject: [PATCH] build-all.py - opencollada patch to support config package on Unix --- nix/build-all.py | 4 ++++ .../allow_static_libraries_config_on_unix.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 nix/patches/opencollada/allow_static_libraries_config_on_unix.patch diff --git a/nix/build-all.py b/nix/build-all.py index 89d0048fd6..8c4e9a2d21 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -892,6 +892,10 @@ if "libxml2" in targets: if "OpenCOLLADA" in targets: patches = ["./patches/opencollada/pr622_and_disable_subdirs.patch"] + # This patch allows static libraries config on Unix, + # because the config is weird and doesn't allow non-shared libraries on Unix. + patches.append("./patches/opencollada/allow_static_libraries_config_on_unix.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 diff --git a/nix/patches/opencollada/allow_static_libraries_config_on_unix.patch b/nix/patches/opencollada/allow_static_libraries_config_on_unix.patch new file mode 100644 index 0000000000..936d5c2029 --- /dev/null +++ b/nix/patches/opencollada/allow_static_libraries_config_on_unix.patch @@ -0,0 +1,13 @@ +diff --git a/OpenCOLLADAConfig.cmake.in b/OpenCOLLADAConfig.cmake.in +index d765b108..6800c2a7 100644 +--- a/OpenCOLLADAConfig.cmake.in ++++ b/OpenCOLLADAConfig.cmake.in +@@ -31,7 +31,7 @@ set(OPENCOLLADA_INCLUDE_DIRS + include("@PACKAGE_OPENCOLLADA_INST_CMAKECONFIG@/OpenCOLLADATargets.cmake") + + # Set the library variable +-if(UNIX) ++if(0) + set(OPENCOLLADA_LIBRARIES + ftoa_shared + buffer_shared