configure.ac | 4 ++--
external/liblangtag/ExternalProject_liblangtag.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 363df4734ed95d89fe29d8509937bd25cef095ca
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Feb 3 19:32:22 2025 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Mar 5 11:18:32 2025 +0100
wsl-as-helper: also support winget's version of Git on aarch64
the current version of Git.Git apparently is now available in a version
compiled for arm64 specifically, so also look for clangarm64 is PATH to
properly detect git-bash / wsl-as-helper method in that case
Change-Id: I3668220b7231cfa8e998b742f4357f7a1e9b4823
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181075
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit 5d15a29f271c09f27a87bce2be2185fd62c635fe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181092
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 2dbf5a2875d4..088409c0f81f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,11 +316,11 @@ dnl checks build and host OSes
dnl do this before argument processing to allow for platform dependent defaults
dnl ===================================================================
-# are we running in wsl but are called from git-bash/env with mingw64 in path?
+# are we running in wsl but are called from git-bash/env with mingw64 or
clangarm64 in path?
# if so, we aim to run nearly everything in the Windows realm, and only run
autogen/configure
# in wsl and run a few tools via wsl
WSL_ONLY_AS_HELPER=
-if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q mingw64); then
+if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q -e mingw64 -e
clangarm64); then
WSL_ONLY_AS_HELPER=TRUE
AC_ARG_WITH([strawberry-perl-portable],
[AS_HELP_STRING([--with-strawberry-perl-portable],
commit d8ca1c7e97c25972a961ce6d0fb902f4d90a370a
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Feb 3 15:49:21 2025 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Mar 5 11:18:23 2025 +0100
wsl-as-helper: make liblangtag more resilient (MSYS path mangling)
different versions of git-bash come with different msys library that behave
slightly differently when it comes to the path mangling that occurs. When
msys
encounters something that looks like a path, but the path doesn't exist,
then
it prefixes that path using the home of the git-bash installation. That
path is
using the long form and since git-bash usually is installed to Program Files
the build then breaks because the path arguments aren't quoted.
The path-mangling can be prevented by starting the path with a
double-slash, so
--prefix=//usr/local will take care of those instances where git-bash from
Visual Studio works, but git-bash installed via winget fails.
Luckily that seems to be the only case where the differences actually show
themselves.
Change-Id: I702da05b34dc153267f7251810a1c93babf66022
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181061
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit fc4445dc365bf121715d189b0f769d39660c1411)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181091
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/external/liblangtag/ExternalProject_liblangtag.mk
b/external/liblangtag/ExternalProject_liblangtag.mk
index 59748c935442..1ba3bbfcc3c5 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
$(call gb_ExternalProject_run,build,\
unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE)
./configure --disable-modules --disable-test --disable-introspection --with-pic
\
$(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \
- --disable-shared --enable-static, \
+ --disable-shared --enable-static --prefix=//usr/local, \
--enable-shared --disable-static) \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter
TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
