Fix some --without-system-jpeg builds
...like <https://ci.libreoffice.org/job/lo_daily_tb_linux_wasm/1026/>,
> wasm-ld: error: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/LinkTarget/StaticLibrary/liblibjpeg-turbo.a(jchuff.o): undefined symbol: jpeg_nbits_table
apparently broken with 451a7e9c43 "libjpeg-turbo:
upgrade to 3.0.4". But just enabling the missing
workdir/UnpackedTarball/libjpeg-turbo/jpeg_nbits.cxx then caused
> workdir/UnpackedTarball/libjpeg-turbo/jpeg_nbits.c:29:27: error: expected ';' after top level declarator
> 29 | const unsigned char HIDDEN jpeg_nbits_table[65536] = {
> | ^
> | ;
so tweak external/libjpeg-turbo/jconfigint.h a bit more (cf.
workdir/UnpackedTarball/libjpeg-turbo/CMakeLists.txt and
workdir/UnpackedTarball/libjpeg-turbo/jconfigint.h.in).
Change-Id: I3ca1c78b467fb9f1d7584799591dbb8a797320ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183653
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
@@ -91,6 +91,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libjpeg-turbo,\
|
||||
UnpackedTarball/libjpeg-turbo/jidctred \
|
||||
UnpackedTarball/libjpeg-turbo/jmemmgr \
|
||||
UnpackedTarball/libjpeg-turbo/jmemnobs \
|
||||
UnpackedTarball/libjpeg-turbo/jpeg_nbits \
|
||||
UnpackedTarball/libjpeg-turbo/jquant1 \
|
||||
UnpackedTarball/libjpeg-turbo/jquant2 \
|
||||
UnpackedTarball/libjpeg-turbo/jutils \
|
||||
|
||||
Vendored
+5
@@ -3,6 +3,11 @@
|
||||
/* libjpeg-turbo build number */
|
||||
#define BUILD "20230315"
|
||||
|
||||
/* How to hide global symbols. */
|
||||
#if defined __GNUC__
|
||||
#define HIDDEN __attribute__((visibility("hidden")))
|
||||
#endif
|
||||
|
||||
/* Compiler's inline keyword */
|
||||
#undef inline
|
||||
|
||||
|
||||
Reference in New Issue
Block a user