diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-20 16:09:38 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-20 18:37:08 +0100 |
| commit | 1ad8c5066bdb6ea825ad09d2a6c7f633b974fc69 (patch) | |
| tree | 7bf15f56f220bbd9fb8618198ed1fe9d815dfb75 /solenv | |
| parent | 493d3558c6e6dce980cb92434f72c0ad03487aa0 (diff) | |
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 <glogow@fbihome.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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 $@ |