Make deps: Fix zlib symbols defined twice
ClosedPublic
Actions

Authored by Sergey Sharybin (sergey) on Jan 21 2020, 10:47 AM.

Details

Reviewers

Brecht Van Lommel (brecht)
Arto Kitula (akitula)
Bastien Montagne (mont29)
Campbell Barton (campbellbarton)
Ray Molenkamp (LazyDodo)

Commits

rB544ee7a4f2f8: Make deps: Fix zlib symbols defined twice

Summary

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.

Diff Detail

Repository

rB Blender

Branch

make_deps_blosc (branched from master)

Build Status

Buildable 6345
Build 6345: arc lint + arc unit

Event Timeline

Sergey Sharybin (sergey) created this revision.Jan 21 2020, 10:47 AM

Harbormaster completed remote builds in B6345: Diff 21025.Jan 21 2020, 10:47 AM

Sergey Sharybin (sergey) planned changes to this revision.Jan 21 2020, 10:47 AM

Sergey Sharybin (sergey) requested review of this revision.Jan 21 2020, 2:22 PM

Sergey Sharybin (sergey) added reviewers: Brecht Van Lommel (brecht), Arto Kitula (akitula), Bastien Montagne (mont29).

Sergey Sharybin (sergey) added a reviewer: Campbell Barton (campbellbarton).

Sergey Sharybin (sergey) mentioned this in D6642: CMake: Refactor external dependencies handling.Jan 21 2020, 2:22 PM

Sergey Sharybin (sergey) added a reviewer: Ray Molenkamp (LazyDodo).Jan 21 2020, 2:23 PM

Makes sense to me…

This revision is now accepted and ready to land.Jan 21 2020, 3:48 PM

Ray Molenkamp (LazyDodo) accepted this revision.Jan 21 2020, 3:52 PM

Brecht Van Lommel (brecht) accepted this revision.Jan 21 2020, 5:03 PM

We currently have a related issue in the macOS libs, in that Blosc was compiled
with an external LZ4 library and fails to build on buildbot.

In the process of fixing that, I noticed that there is actually no
PREFER_EXTERNAL_ZLIB in Blosc 1.5 yet, so this patch will not work.

As a solution, this patches Blosc 1.5 to have an PREFER_EXTERNAL_ZLIB and not
use external LZ4. When we upgrade to a newer version of Blosc again, we can
remove this part of the patch and it should continue to work.

Harbormaster completed remote builds in B6359: Diff 21060.Jan 22 2020, 3:25 PM

Brecht Van Lommel (brecht) mentioned this in rBL62359: macOS libraries: fix Blosc being linked against external LZ4 library.Jan 22 2020, 3:50 PM

Closed by commit rB544ee7a4f2f8: Make deps: Fix zlib symbols defined twice (authored by Brecht Van Lommel (brecht), committed by Sergey Sharybin (sergey)). · Explain WhyJan 23 2020, 4:59 PM

This revision was automatically updated to reflect the committed changes.

Sergey Sharybin (sergey) added a commit: rB544ee7a4f2f8: Make deps: Fix zlib symbols defined twice.

Sergey Sharybin (sergey) mentioned this in rB517870a4a11f: CMake: Refactor external dependencies handling.

Brecht Van Lommel (brecht) mentioned this in rC5b848febdec0: CMake: Refactor external dependencies handling.Jan 31 2020, 6:29 PM