[Libreoffice-commits] core.git: odk/CustomTarget_build-examples.mk

[Stephan Bergmann]

 odk/CustomTarget_build-examples.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 761f7b584ee4ba4d34e983733d49357a4b8c15be
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 7 15:22:25 2017 +0100

    Force CustomTarget_build-examples into en-US locale
    
    odk/examples/DevelopersGuide/Components/SimpleLicense/ builds an example
    extension with a license that needs to be accepted when the extension is
    installed.  That's why odk/CustomTarget_build-examples.mk writes "yes" into
    stdin.  Unfortunately, the expected acceptance string is localized, so running
    this in e.g. a Linux de_DE.UTF-8 locale fails.  For Linux and macOS at least
    (which are the only platforms on which this test is currently enabled), it
    suffices to to set LC_ALL=C to force LO into its en-US locale.
    
    Change-Id: I1df0ea89400913ac3f1c90507721040119354727
    Reviewed-on: https://gerrit.libreoffice.org/34951
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
index 68587c0..89e4273 100644
--- a/odk/CustomTarget_build-examples.mk
+++ b/odk/CustomTarget_build-examples.mk
@@ -97,7 +97,7 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \
             UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,odk/build-examples)/user) \
         $(foreach my_dir,$(my_example_dirs), \
             && (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
-                && printf 'yes\n' | make))) \
+                && printf 'yes\n' | LC_ALL=C make))) \
             >$(call gb_CustomTarget_get_workdir,odk/build-examples)/log 2>&1 \
         || (RET=$$? \
             && cat $(call gb_CustomTarget_get_workdir,odk/build-examples)/log \