diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-08-14 15:41:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-08-15 11:51:45 +0200 |
| commit | 72b118e4cb7f97cbd296fd829a463fe9fafb8486 (patch) | |
| tree | de3bb71e92dbd734c35f257633323e9c089ae807 /external/libtiff | |
| parent | 4afd83245b6ab2232032c74b1d242122fc734352 (diff) | |
set libtiff ac_cv_lib_jpeg_jpeg12_read_scanlines cache val to false
to avoid:
...
checking for jpeg12_read_scanlines in -ljpeg... yes
...
JPEG 8/12 bit dual mode: yes (libjpeg turbo >= 2.2 dual mode)
...
tif_jpeg.c:143:25: error: unknown type name ‘J12SAMPARRAY’
143 | #define TIFF_JSAMPARRAY J12SAMPARRAY
where the system jpeg is linked against during configure but the build
is against the internal jpeg and the system one happens to support
jpeg12_read_scanlines
Change-Id: I895d77c59a5bef1af0b1a85d44da1a54e502f8e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155670
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'external/libtiff')
| -rw-r--r-- | external/libtiff/ExternalProject_libtiff.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/external/libtiff/ExternalProject_libtiff.mk b/external/libtiff/ExternalProject_libtiff.mk index e318126dcfe0..f6bcba106669 100644 --- a/external/libtiff/ExternalProject_libtiff.mk +++ b/external/libtiff/ExternalProject_libtiff.mk @@ -23,9 +23,10 @@ $(eval $(call gb_ExternalProject_use_autoconf,libtiff,build)) # using ac_cv_lib_z_inflateEnd=yes to skip test for our # static windows lib where the name is zlib not z -# using ac_cv_lib_jpeg_jpeg_read_scanlines to skip test -# for our static windows lib where the name is libjpeg-turbo.lib -# not libjpeg.lib +# using ac_cv_lib_jpeg_jpeg_read_scanlines and +# ac_cv_lib_jpeg_jpeg12_read_scanlines to skip tests +# for our static jpeg lib where the name is libjpeg-turbo.lib +# or liblibjpeg-turbo.a not libjpeg.lib/libjpeg.a # we're building this statically anyway so the lib isn't # used during the link done here @@ -63,6 +64,7 @@ $(call gb_ExternalProject_get_state_target,libtiff,build) : LDFLAGS="$(call gb_ExternalProject_get_link_flags,libtiff) $(gb_EMSCRIPTEN_LDFLAGS)" \ ac_cv_lib_z_inflateEnd=yes \ ac_cv_lib_jpeg_jpeg_read_scanlines=yes \ + ac_cv_lib_jpeg_jpeg12_read_scanlines=no \ ac_cv_lib_webp_WebPDecode=yes \ $(gb_CONFIGURE_PLATFORMS) \ && cd libtiff && $(MAKE) libtiff.la \ |