ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Make CustomTarget_odk/build-examples_java more robust against localized envs

Browse Source 
At least on Linux, with a --with-lang=ALL build, `LANGUAGE=de make
CustomTarget_odk/build-examples_java' would fail, as it would ask for license
agreement in German rather than English (presumably because the code in
getUILangFromEnvironment, i18nlangtag/source/isolang/inunx.cxx, inspects the
LANGUAGE env var fist thing), so would expect a "ja" rather than the "yes" we
feed into stdin.

Change-Id: If285e4458e0706102a62f4e0094e5144575ccf7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158998
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2023-11-06 21:18:20 +01:00
parent c9cedde7c0
commit b21cab3f17
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
odk/build-examples_common.mk
+1 -1
View File
@@ -46,7 +46,7 @@ else
UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,$(1))/user) \
$(foreach my_dir,$(2), \
&& (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
&& printf 'yes\n' | LC_ALL=C make -j1 \
&& printf 'yes\n' | LANGUAGE= LC_ALL=C make -j1 \
CC="$(CXX) $(gb_CXX03FLAGS)" LINK="$(CXX)" LIB="$(CXX)" \
$(if $(MACOSX_SHELL_HACK), SHELL="$$$$ODK_BUILD_SHELL", ))) \
$(if $(MACOSX_SHELL_HACK),&& rm -f "$$$$ODK_BUILD_SHELL")) \