configure.ac |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7b31137fee6b9c81bd88944f9dd08c9ad4620103
Author:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Aug 17 13:55:04 2022 +0200
Commit:     Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Wed Jun 14 16:46:59 2023 +0200

    fix ant related test for paths with non-ascii characters
    
    autoconf forces LC_ALL=C and that in turn sets java's I/O encoding
    without a way to override separately
    (https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4163515)
    and that breaks if the build/source path contains non-ascii characters:
    
    java.lang.ExceptionInInitializerError
      […]
    Caused by: java.nio.file.InvalidPathException: Malformed input or input 
contains unmappable characters
      […]
    
    so set LC_ALL to $LANG for the ant/java tests to unbreak that part of
    the tests.
    
    Change-Id: I5bf197acd48610f1861904be027aa027e1d46024
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138441
    Tested-by: Jenkins
    Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/configure.ac b/configure.ac
index ed6475647a28..4c1efff0799e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13649,6 +13649,9 @@ dnl 
===================================================================
 dnl Test for the presence of Ant and that it works
 dnl ===================================================================
 
+# java takes the encoding from LC_ALL, and since autoconf forces it to C it
+# breaks filename decoding, so for the ant section, set it to LANG
+LC_ALL=$LANG
 if test "$ENABLE_JAVA" != "" -a "$NEED_ANT" = "TRUE" -a "$cross_compiling" != 
"yes"; then
     ANT_HOME=; export ANT_HOME
     WITH_ANT_HOME=; export WITH_ANT_HOME
@@ -13867,7 +13870,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" 
-a "$cross_compiling" != "
 fi
 AC_SUBST(OOO_JUNIT_JAR)
 AC_SUBST(HAMCREST_JAR)
-
+# set back LC_ALL to C after the java related tests...
+LC_ALL=C
 
 AC_SUBST(SCPDEFS)
 

Reply via email to