diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-02-10 16:54:19 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-02-10 21:47:25 +0100 |
| commit | 7973ba264101f46356d632545e4cb303f5b6d6c1 (patch) | |
| tree | 1010aff2123ac1993ac7b8c58cb3b41b721906cf /external | |
| parent | f8eb28d6b6e306d87e5cec3f1b6f83c841a5f01e (diff) | |
cross-toolset: fix galleries build with webp
All the tested cross builds don't build galleries, so the
cross-toolset won't contain gengal and no vcl is build.
To fix the full static build, add LIBWEBP to the list of
PERMITTED_BUILD_TARGETS and use gb_CONFIGURE_PLATFORMS to
provide the --host and --build flags.
Regression from commit 60eaa424c5e213f31227008e1ed66a646491a360
("support for the WebP image format (tdf#114532)").
Change-Id: I017c4fc72456859616d535ddfb2d568442ffa446
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129790
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libwebp/ExternalProject_libwebp.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libwebp/ExternalProject_libwebp.mk b/external/libwebp/ExternalProject_libwebp.mk index f62d4846d68e..7a709c1bddcf 100644 --- a/external/libwebp/ExternalProject_libwebp.mk +++ b/external/libwebp/ExternalProject_libwebp.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,libwebp,build) : $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(gb_CONFIGURE_PLATFORMS) \ && $(MAKE) \ ) $(call gb_Trace_EndRange,libwebp,EXTERNAL) |