Blender Git Loki

Git Commits -> Revision 544ee7a

Revision 544ee7a by Brecht Van Lommel (master)
January 23, 2020, 15:59 (GMT)
Make deps: Fix zlib symbols defined twice

We compile zlib as own dependency, but are not informing BLOSC
to use it. This leads to zlib symbols defined twice when linking
Blender: one set comes from libz.a and another one from libblosc.a.

Tested on Linux Debian testing and CentOS 7.5.

It is possible that this change on its own will lead to linking
errors after libraries are re-compiled, This will be fixed as
a dedicated fix to Blender's build system.

Reviewed By: brecht, mont29, LazyDodo

Differential Revision: https://developer.blender.org/D6641

Commit Details:

Full Hash: 544ee7a4f2f81094967559dfd1dd21ae9f4b9809
Parent Commit: d9d11e2
Committed By: Sergey Sharybin
Lines Changed: +69, -7

2 Modified Paths:

/build_files/build_environment/cmake/blosc.cmake (+5, -7) (Diff)
/build_files/build_environment/patches/blosc.diff (+64, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021