From 1ad8c5066bdb6ea825ad09d2a6c7f633b974fc69 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Thu, 20 Jan 2022 16:09:38 +0100 Subject: Sorting component implementations needs LC_ALL=C Change-Id: Ifba53b95fdefed59123a2e682e787119b6c67857 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128689 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- solenv/gbuild/ComponentTarget.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv/gbuild') diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index ce0224433661..aed3fd88e889 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -62,18 +62,18 @@ $(call gb_ComponentTarget_get_target,%).optionals : \ | $(call gb_ComponentTarget_get_target,%).dir \ $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ - $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) 2>&1 | sort > $@ + $(gb_ComponentTarget_XSLT_DUMP_OPTIONALS) $(COMPONENTSOURCE) 2>&1 | LC_ALL=C $(SORT) > $@ # %.filtered : list of all optional implementations we don't build .PRECIOUS: $(call gb_ComponentTarget_get_target,%).filtered $(call gb_ComponentTarget_get_target,%).filtered : $(call gb_ComponentTarget_get_target,%).optionals - cat $< $(COMPONENTIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | sort | uniq -u > $@ + cat $< $(COMPONENTIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | LC_ALL=C $(SORT) | $(UNIQ) -u > $@ # %.allfiltered : contains all possible filtered components, which must match %.optionals .PRECIOUS: $(call gb_ComponentTarget_get_target,%).allfiltered $(call gb_ComponentTarget_get_target,%).allfiltered : $(call gb_ComponentTarget_get_target,%).optionals $(if $(ALLFILTEREDIMPL), \ - cat $(ALLFILTEREDIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | sort | uniq > $@.tmp, \ + cat $(ALLFILTEREDIMPL) | sed -e '/^#/d' -e '/^[ ]*$$/d' | LC_ALL=C $(SORT) -u > $@.tmp, \ touch $@.tmp) $(DIFF) -u $< $@.tmp mv $@.tmp $@ -- cgit