configure.ac | 1 +
external/libwebp/ExternalProject_libwebp.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7973ba264101f46356d632545e4cb303f5b6d6c1
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Thu Feb 10 16:54:19 2022 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Feb 10 21:47:25 2022 +0100
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 <glo...@fbihome.de>
diff --git a/configure.ac b/configure.ac
index 3e33706646cf..f48477c64168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5667,6 +5667,7 @@ if test "$cross_compiling" = "yes"; then
LibO
LIBFFI
LIBPN
+ LIBWEBP
LIBXML2
LIBXSLT
MDDS
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)
