external/liblangtag/ExternalProject_liblangtag.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fc4445dc365bf121715d189b0f769d39660c1411
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Feb 3 15:49:21 2025 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Feb 4 11:08:24 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>
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") \
