config_host.mk.in | 1 +
configure.ac | 6 ++++++
solenv/gbuild/ComponentTarget.mk | 6 +++---
3 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 1ad8c5066bdb6ea825ad09d2a6c7f633b974fc69
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Thu Jan 20 16:09:38 2022 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Jan 20 18:37:08 2022 +0100
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 <glo...@fbihome.de>
diff --git a/config_host.mk.in b/config_host.mk.in
index 9a0388fa0d35..193406c8fbc9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -685,6 +685,7 @@ export TOUCH=@TOUCH@
export UCRTSDKDIR=@UCRTSDKDIR@
export UCRTVERSION=@UCRTVERSION@
export UCRT_REDISTDIR=@UCRT_REDISTDIR@
+export UNIQ=@UNIQ@
export UNIX_DLAPI_LIBS=@UNIX_DLAPI_LIBS@
export USE_HEADLESS_CODE=@USE_HEADLESS_CODE@
export USE_LD=@USE_LD@
diff --git a/configure.ac b/configure.ac
index 751ad1ebb872..53b2323a2c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11415,6 +11415,12 @@ if test -z "$DIFF"; then
fi
AC_SUBST([DIFF])
+AC_PATH_PROG(UNIQ, uniq)
+if test -z "$UNIQ"; then
+ AC_MSG_ERROR(["uniq" not found in \$PATH, install it])
+fi
+AC_SUBST([UNIQ])
+
dnl ***************************************
dnl Checking for patch
dnl ***************************************
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 $@
