[klibc] [klibc:update-dash] Revert " dash: mkbuiltins: Fix sort order harder"
klibc-bot for Ben Hutchings
ben at decadent.org.uk
Sat Mar 28 14:48:04 PDT 2020
Commit-ID: 67295677e7f4b89f55c484b44735728ea610edf4
Gitweb: http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=67295677e7f4b89f55c484b44735728ea610edf4
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: Sat, 28 Mar 2020 20:29:44 +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/README.dash | 1 -
usr/dash/mkbuiltins | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/usr/dash/README.dash b/usr/dash/README.dash
index 11ecff54..e33335a5 100644
--- a/usr/dash/README.dash
+++ b/usr/dash/README.dash
@@ -15,7 +15,6 @@ Several changes have been made for klibc:
klibc's own signal name array. decode_signal() is changed similarly.
* The read built-in implements the -t option like bash
* mktokens is modified to support out-of-tree builds
-* mkbuiltins is modified to sort with LC_ALL=C
* Some header files have header guards added
* Changelog and some manual pages are omitted
* Automatic whitespace fixups
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