diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-02-27 15:07:11 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-02-27 15:12:07 +0300 |
| commit | 28f0a4b27e5b98e9060c3c86062b4155d70d94f3 (patch) | |
| tree | f0bb9116f93785ff3c0012737bd40ab637fee351 | |
| parent | 4b16cb1e9aff4410cda1e2182e73330c814f99ac (diff) | |
Fix (unreported) broken OCIO from install_deps.
Looks like they removed static libs by default in OCIO 2.0, for some
historical reasons `install_deps` was enforcing using only static libs
for this one, now removed it so that Blender buil can use usual so's.
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 259a0bd0c33..3b364c21f7d 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1732,7 +1732,7 @@ compile_OCIO() { fi # To be changed each time we make edits that would modify the compiled result! - ocio_magic=2 + ocio_magic=3 _init_ocio # Force having own builds for the dependencies. @@ -1802,11 +1802,11 @@ compile_OCIO() { make -j$THREADS && make install # Force linking against static libs - rm -f $_inst/lib/*.so* + #rm -f $_inst/lib/*.so* # Additional depencencies - cp ext/dist/lib/libtinyxml.a $_inst/lib - cp ext/dist/lib/libyaml-cpp.a $_inst/lib + #cp ext/dist/lib/libtinyxml.a $_inst/lib + #cp ext/dist/lib/libyaml-cpp.a $_inst/lib make clean |