[klibc] [klibc:update-dash] Revert " dash: mkbuiltins: Fix sort order harder"

klibc-bot for Ben Hutchings ben at decadent.org.uk
Thu Jan 24 19:15:04 PST 2019


Commit-ID:  3c92107fcc57634d918ec844213a0b9267cac0cf
Gitweb:     http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=3c92107fcc57634d918ec844213a0b9267cac0cf
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Fri, 25 Jan 2019 01:34:43 +0000
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Fri, 25 Jan 2019 02:57:21 +0000

Revert "[klibc] dash: mkbuiltins: Fix sort order harder"

This reverts commit 5125a8b74971fc22fdc74cfc9dc8e04a4f5c0e4b.
The problem that it solves was fixed differently upstream.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

---
 usr/dash/mkbuiltins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/dash/mkbuiltins b/usr/dash/mkbuiltins
index 70308bd8..f562ae22 100644
--- a/usr/dash/mkbuiltins
+++ b/usr/dash/mkbuiltins
@@ -78,7 +78,7 @@ awk '{	for (i = 2 ; i <= NF ; i++) {
 		if ($i ~ /^-/)
 			line = $(++i) "\t" line
 		print line
-	}}' $temp | LC_ALL=C sort -k 1,1 | tee $temp2 | awk '{
+	}}' $temp | LC_COLLATE=C sort -k 1,1 | tee $temp2 | awk '{
 		opt = ""
 		if (NF > 2) {
 			opt = substr($2, 2)


More information about the klibc mailing list