RepositoryModule_build.mk | 1 +
configure.ac | 1 -
oox/Module_oox.mk | 5 +++++
3 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 5a63e1afb246da0afb5ba7f1ad90b2dec0dddf81
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Dec 14 17:09:01 2022 +0000
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Thu Dec 15 00:44:59 2022 +0000
add oox to WITH_GALLERY_BUILD build side
This is needed for WNT/ARM cross build since commit
ce4c154e8b254f3bcd59ea46b3db4bd3d5a26058.
Additionally, revert "Add oox to build side, for cross compilation"
This reverts commit 599f9836a674ec525e56fa787a800d7ed4be3383.
Reason for revert: It doesn't do anything
Change-Id: I03cf9a2bb3bc505772b1bd2a2d96cd2b29cf14c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144170
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144198
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index de906d605c53..2f3a06edd12a 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
framework \
linguistic \
officecfg \
+ oox \
package \
postprocess \
sfx2 \
diff --git a/configure.ac b/configure.ac
index 93e02435e639..9e92838241e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5797,7 +5797,6 @@ if test "$cross_compiling" = "yes"; then
LIBXSLT
MDDS
NATIVE
- OOX
OPENSSL
ORCUS
PYTHON
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index 75ef85051f85..f868a126a61c 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_Module_Module,oox))
$(eval $(call gb_Module_add_targets,oox,\
CustomTarget_generated \
+))
+
+ifeq ($(gb_Side),host)
+$(eval $(call gb_Module_add_targets,oox,\
Library_oox \
Package_customshapes \
Package_generated \
@@ -31,5 +35,6 @@ $(eval $(call gb_Module_add_check_targets,oox,\
CppunitTest_oox_shape \
CppunitTest_oox_export \
))
+endif
# vim: set noet sw=4 ts=4:
