diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-01-05 08:07:11 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2022-09-26 20:56:42 +0200 |
| commit | b48cb69dae4118fe4a471921510281bbd16f5c4f (patch) | |
| tree | fc5b688277eff6680d04755be465e2b4cd2f9fa8 /external | |
| parent | ac891f0ba9d4c2675d7dae8390a28f44a7a83eaf (diff) | |
Explicitly build external/freetype --without-png
...instead of having its configure.ac determine whether to support png based on
it being installed on the system, but which then might cause a Linux
--without-system-freetype build to fail to link Library_pdfium with
> workdir/UnpackedTarball/freetype/src/sfnt/pngshim.c:199: error: undefined reference to 'png_get_error_ptr'
etc.
Change-Id: Idf47ba5252b8f4d7f2e295f7adf6b761dbee4d2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127985
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140053
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index a3e0a7ca3e4b..4cb2920ae923 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -23,6 +23,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : --without-brotli \ --without-bzip2 \ --without-harfbuzz \ + --without-png \ --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ CFLAGS="$(CFLAGS) $(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \ |