live-bootstrap

commit: fef663a46b9af22292e6d2fe94c5af9a606a9d4c
parent 7c90d5bf4c632f41b1b493ffe845857ae6fdfdcb
Author: Paul Dersey <pdersey@gmail.com>
Date:   Fri, 22 Jan 2021 16:41:47 -0500

coreutils: Fix build of ls

Diffstat:
M
sysa/coreutils-5.0/coreutils-5.0.kaem
1
+
M
sysa/coreutils-5.0/mk/main.mk
4
++--
A
sysa/coreutils-5.0/patches/ls-strcmp.patch
11
+++++++++++

3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sysa/coreutils-5.0/coreutils-5.0.kaem b/sysa/coreutils-5.0/coreutils-5.0.kaem
@@ -18,6 +18,7 @@ catm config.h
 
 patch -Np0 -i ../../patches/modechange.patch
 patch -Np0 -i ../../patches/mbstate.patch
+patch -Np0 -i ../../patches/ls-strcmp.patch
 
 # Build and install
 /after/bin/make -f Makefile
diff --git a/sysa/coreutils-5.0/mk/main.mk b/sysa/coreutils-5.0/mk/main.mk
@@ -73,8 +73,8 @@ COREUTILS = basename cat chmod cksum csplit cut echo expand factor false fmt fol
 
 BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
 
-ALL=$(BINARIES) $(SRC_DIR)/install $(SRC_DIR)/md5sum $(SRC_DIR)/mv $(SRC_DIR)/rm $(SRC_DIR)/sha1sum
-all: $(BINARIES) $(SRC_DIR)/install $(SRC_DIR)/md5sum $(SRC_DIR)/mv $(SRC_DIR)/rm $(SRC_DIR)/sha1sum
+ALL=$(BINARIES) $(SRC_DIR)/ls $(SRC_DIR)/install $(SRC_DIR)/md5sum $(SRC_DIR)/mv $(SRC_DIR)/rm $(SRC_DIR)/sha1sum
+all: $(BINARIES) $(SRC_DIR)/ls $(SRC_DIR)/install $(SRC_DIR)/md5sum $(SRC_DIR)/mv $(SRC_DIR)/rm $(SRC_DIR)/sha1sum
 
 LIB_DIR = lib
 LIB_SRC = acl getdate posixtm posixver strftime getopt getopt1 hash hash-pjw addext argmatch backupfile basename canon-host closeout cycle-check diacrit dirname dup-safer error exclude exitfail filemode __fpending file-type fnmatch fopen-safer full-read full-write getline getstr gettime hard-locale human idcache isdir imaxtostr linebuffer localcharset long-options makepath mbswidth md5 memcasecmp memcoll modechange offtostr path-concat physmem quote quotearg readtokens rpmatch safe-read safe-write same save-cwd savedir settime sha stpcpy stripslash strtoimax strtoumax umaxtostr unicodeio userspec version-etc xgetcwd xgethostname xmalloc xmemcoll xnanosleep xreadlink xstrdup xstrtod xstrtol xstrtoul xstrtoimax xstrtoumax yesno strnlen getcwd sig2str mountlist regex canonicalize mkstemp memrchr euidaccess ftw dirfd obstack strverscmp strftime tsearch
diff --git a/sysa/coreutils-5.0/patches/ls-strcmp.patch b/sysa/coreutils-5.0/patches/ls-strcmp.patch
@@ -0,0 +1,11 @@
+--- src/ls.c
++++ src/ls.c
+@@ -2597,7 +2597,7 @@ xstrcoll (char const *a, char const *b)
+ {
+   int diff;
+   errno = 0;
+-  diff = strcoll (a, b);
++  diff = strcmp (a, b);
+   if (errno)
+     {
+       error (0, errno, _("cannot compare file names %s and %s"),