configure.ac | 11 ++++++++---
instsetoo_native/CustomTarget_install.mk | 1 +
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 9bd93466e47c3a472b273f3846169afbdf063885
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Apr 23 10:44:53 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Apr 26 14:02:52 2024 +0200
Honor TMPDIR configure option in WSL_ONLY_AS_HELPER mode
(It needs to be passed-in as a TMPDIR=/mnt/c/... style path, because
configure
uses it early on and otherwise fails with some
> checking build system type... config.guess: cannot create a temporary
directory in C:/...
error.)
Change-Id: I798ed7dd363eb5fd7614c5984861f77cf9d38266
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166506
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/configure.ac b/configure.ac
index 90cbfb33f9e2..48faa25c4acc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15296,6 +15296,9 @@ AC_SUBST(PERL)
if test -n "$TMPDIR"; then
TEMP_DIRECTORY="$TMPDIR"
+ if test -n "$WSL_ONLY_AS_HELPER"; then
+ TEMP_DIRECTORY=$(wslpath -m "$TEMP_DIRECTORY")
+ fi
else
TEMP_DIRECTORY="/tmp"
fi
@@ -15426,8 +15429,10 @@ if test -n "$WSL_ONLY_AS_HELPER"; then
# append strawberry tools dir to PATH (for e.g. windres, ar)
LO_PATH="$LO_PATH:$STRAWBERRY_TOOLS"
# temp-dir needs to be in windows realm, hardcode for now
- mkdir -p tmp
- TEMP_DIRECTORY="$BUILDDIR/tmp"
+ if test "$TEMP_DIRECTORY" = /tmp; then
+ mkdir -p tmp
+ TEMP_DIRECTORY="$BUILDDIR/tmp"
+ fi
fi
# Keep in sync with list of files far up, at AC_MSG_CHECKING([for
commit 649314399483331244538128149ebd0556166540
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Apr 23 08:49:46 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Apr 26 14:02:45 2024 +0200
Don't hardcode build as x86_64 for WSL_ONLY_AS_HELPER
...to also make it work builds on aarch64
Change-Id: Ibc502b11eedceddb84481c2ad5d351bf8404c8cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166501
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/configure.ac b/configure.ac
index cf14c248e948..90cbfb33f9e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15404,7 +15404,7 @@ AC_CONFIG_LINKS([include:include])
if test -n "$WSL_ONLY_AS_HELPER"; then
# while we configure in linux, we actually compile in "cygwin" (close
enough at least)
- build="x86_64-pc-cygwin"
+ build=$host
PathFormat "$SRC_ROOT"
SRC_ROOT="$formatted_path"
PathFormat "$BUILDDIR"
commit 683d9496bd993c638d7f44af8d03b86b9ed8faaa
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Apr 19 16:12:22 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Apr 26 14:02:37 2024 +0200
use strawberry perl for installation packaging in wsl-as-helper case
changing it to git-bash perl can probably be done, but would require
more changes to the path handling in the packaging code
Change-Id: I9a31ee6e9f122a2c167e11f5b4f73b18c5c0fa81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166343
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 4a6d92e1cd00..d3a6ad3a96a9 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -121,6 +121,7 @@ $(instsetoo_installer_targets):
$(SRCDIR)/solenv/bin/make_installer.pl \
$(if $(filter %msi‧nostrip,$@),$(gb_Make_JobLimiter) grab)
$(call gb_Trace_StartRange,$@,INSTALLER)
$(call gb_Helper_print_on_error, \
+ $(if $(MSYSTEM),export PERLIO=:unix PERL=$(STRAWBERRY_PERL) &&) \
$(SRCDIR)/solenv/bin/call_installer.sh $(if
$(verbose),-verbose,-quiet) $(subst ‧,:,$@),\
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/$(if
$(filter en-US$(COMMA)%,$(instsetoo_installer_langs)),$(subst
$(instsetoo_installer_langs),multilang,$@),$@).log)
$(if $(filter %msi‧nostrip,$@),$(gb_Make_JobLimiter) release)
