diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-11-25 11:27:57 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-03-08 20:52:13 +0100 |
| commit | 6ced843b73674067a3965b572e6b7e417a054a71 (patch) | |
| tree | 201ead2c6619f5d947c4a1b3162f61ae4e94e69d /external | |
| parent | tdf#74670 tdf#91286 PPTX XLSX export: save image once (diff) | |
| download | core-6ced843b73674067a3965b572e6b7e417a054a71.tar.gz core-6ced843b73674067a3965b572e6b7e417a054a71.zip | |
freetype: don't build yet another copy of zlib
Since commit e515267602d9049bc15739a215f43f1379141d81 the zlib that's
statically linked into freetype conflicts with the zlib that's
statically linked into Qt5 because both appear to rename the symbols via
Z_PREFIX to the same names and thus the linker complains about duplicate
symbols.
Apparently --without-zlib doesn't disable the feature but instead causes
freetype to use its own copy; just use --with-zlib instead and rely on
the ZLIB_CFLAGS/ZLIB_LIBS to find LO's bundled zlib.
Change-Id: I0b5684ca6556c3da7874c17ff2da97b2753b0262
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143289
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index a3e0a7ca3e4b..d8d896c5e0e0 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : $(gb_RUN_CONFIGURE) ./configure \ --disable-shared \ --with-pic \ - --without-zlib \ + --with-zlib \ --without-brotli \ --without-bzip2 \ --without-harfbuzz \ |