commit: fe26bc4c8c7c89e4280d6bf389cafc7efea5464f
parent e655cb97f5e4d872b97170ab2d9a00b378232c5e
Author: Andrius Štikonas <andrius@stikonas.eu>
Date: Sat, 13 Mar 2021 19:32:19 +0000
Do not use pre-generated getdate.c
Diffstat:
9 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/sysa/coreutils-5.0/checksums/pass1 b/sysa/coreutils-5.0/checksums/pass1
@@ -37,7 +37,6 @@ d5d329c9bb11ea3cb9b95d0a7bea948b48defe5738882b8148f766cbbfcf30c3 /after/bin/spl
f77918803ea96e92e10c653f53a196ff2f3444e8317d019e2908472b5ff1d2a0 /after/bin/sum
b2e00dee5951d3320ba0adac294311f31858d5860520f262b5b2f788c272fc88 /after/bin/tail
f491c177aaccd96b6f6c61bd288b5f039722edd47ae66e49ace4ae8722a62323 /after/bin/tee
-0b4843b26cbb135e34f87f9255d931f38f8de42a6d93008c36f2682ae5441d54 /after/bin/touch
cc04233f2020b59c0c6ff2b267a7c99ffcedc2a59ff94e09ef1dea7197765f29 /after/bin/tr
dc2b1e033e1b21b0c2cdf0d71c0dae5bf76da11e45b20f5258377ae1638845b7 /after/bin/tsort
997ed6336650515aa97ae96b22f7cbc46d6346ba985e70336c21cbc5113c0066 /after/bin/unexpand
@@ -45,6 +44,7 @@ a7884b7ba882ca34443b638a512dbbc415824d149d3b588b7d2fd7f063300a4f /after/bin/unl
b32921d0f32bee98f4af4d8ab30670dbce2dcf35f63221a6c3fd143859e11d9a /after/bin/wc
4d39991d41b5479a506dc3ce13fa170bd5cfb0031e248f2fa32bf1338935f4af /after/bin/whoami
199c5b3db58b79ca9a6d16352e779c6db1d8aef40d25e396fe41994e42de4720 /after/bin/test
+6339686d665d9c6df2dac3507c6cf750577f2da5ef65b83c8bfc312fb0132ef8 /after/bin/touch
56b8e1436013b40f4fdedd1f240fb80a521a96819a73e38010e24d09430d2c5b /after/bin/true
dd76ea2581577775bee50ca31b436442f60f63a70fab6bb01eef927c1fd6139b /after/bin/yes
30afc17da299c1e7caddc5cbc2389513770aae000284e8623f271f0f3c70c8d7 /after/bin/ls
diff --git a/sysa/coreutils-5.0/checksums/pass2 b/sysa/coreutils-5.0/checksums/pass2
@@ -1,4 +1,3 @@
-6c2c4baa6e75c00896b01ceb4e2f0ef62b59a7f27184ac1c5bf85f6da2983ae5 /after/bin/install
fafa676fe85f662f753bb5257ba6575086c6d4d7b8b27a952624db08e136b1ac /after/bin/basename
8b4e2b1ea346298b6534894e85cfa3ac4ee9bd1900da1d044a45c366d143dbf0 /after/bin/cat
24b11f735c4dcbd28e0defcef6208f419ebb3a7f33a5f7addb41d7df9e021bc1 /after/bin/chmod
@@ -6,10 +5,12 @@ fafa676fe85f662f753bb5257ba6575086c6d4d7b8b27a952624db08e136b1ac /after/bin/bas
6e9c29ae39dc9cc13925fe4066ab1867d0623bc704b2b1be6e242dc27b6c8ea1 /after/bin/cp
220ee0e1e19ad52403794872fd879619c25e2bf6b22d9616799250f76f8b9960 /after/bin/csplit
15eea66971190c390da91bd8537c01b689e1cf24cc96cd256607ef437f07f41d /after/bin/cut
+567d079e9c0122410284414c0f2db2248e78686b403dabd9c7abd12c20ad9f89 /after/bin/dd
c033f4ae4ca47c1ae267d9f983c35366f5bf803b53422a073fbdd60dd3c745a8 /after/bin/dirname
0884b23703671535b882cffe99720d18f0f915b9323184dc20c0b7ef1af9ec4b /after/bin/echo
4bb7dca4382da61d02331c6785f254e04789e9a26e034fd4bbc40b969bdc81a5 /after/bin/env
76932efb69bc33a101a0a72424fc9dd50036b5f3fa09101d2d776a2e8aad7f3d /after/bin/expand
+aea616aaf5c8c63f564a77d4469cbc49088531920dc927db24c70e8c5872c97b /after/bin/expr
6e082caf5494d14d8e8eb0c8284942389198ac0fff8646c08b3136039a8a1579 /after/bin/factor
94132ca47c73ec70cc5f817a7d4c3de8ec37f7664564028c6daf27a1f2a75f37 /after/bin/false
ee5f43940b667026f2152ccde76f8d09cb99eb8adbea29be782876d236ce3797 /after/bin/fmt
@@ -35,13 +36,14 @@ fa7ff4f943ca592c623e41a303e697114a420c0a3e5d91c779dfd57ab39b7053 /after/bin/pwd
1543d06fdbe7fe2a28d6f2aa0a4d8ef69d4c06f6fe8ba605933fed51eda8c7fa /after/bin/rmdir
291f7fdd7d43fc55da4a50d7c7ba9945568b31602e74fbb3ab94a8b25a039595 /after/bin/seq
4b7609bd5da6de314b418be80f1be1a525bb4756efb1e9925f0ae7814c6eedef /after/bin/sleep
+c40dac27f90c5f793a1ed37e78bd1015e44688dc2179da209b1065d02ed0c6e3 /after/bin/sort
5087a0f86f238062a85f2f6ca3e6b33ba6b3c8dd9700e314c1ae3b2af3331409 /after/bin/split
35f681f7cc31a895f5c5e0db8b6a3c203b2ed9ce1771503f198614302e42c600 /after/bin/sum
7272d4fb3313ad3e19c79393d8785d4b343a915e605332eebbc8f5ac5338e071 /after/bin/tail
c2c6fae2cad8e29a75ff3f793ca7d059cc50ea4ee7d55f659e8f2d371f7763d6 /after/bin/tee
-572c000df8155d4153f68b7e1b1a0e2c10c233c092da3ba1665b5b21aa3093e2 /after/bin/touch
643d2912f2055e70284ab036d6d154e4667120726486c3a3329fdb5115b452f2 /after/bin/tr
75d4e74c03ad027b1b7738e6049ec5c01cfdd7a665ec82e0ecdf921d440e71a0 /after/bin/tsort
+c7d92d8291578de76afa58f1a1160f3373b5935b6b6f1dca63bd0d3d210ea161 /after/bin/uname
0a51c8f6dc3ea15fd439e11a14d7c13d7094457e17129e7f5de51d886ed8f54e /after/bin/unexpand
abda7abe33205cda90734216bd3f2cc1dcf859db166d2d6297665a4d178e6bac /after/bin/unlink
f033207cf5de1eac8f4726b1926a33759b294050090932a6f7de6a6d98a8f9e8 /after/bin/wc
@@ -49,8 +51,8 @@ f033207cf5de1eac8f4726b1926a33759b294050090932a6f7de6a6d98a8f9e8 /after/bin/wc
b8942c4ecd012efd53b74a8c5fec424020a7099356c4db017115499016237876 /after/bin/test
8bc7be81630efacca243feb8ecdaa97bc1d0b5a4060e0decf96af49875a06b00 /after/bin/true
84109c279ed6445c896fe04a397bf66e1f73f74200f8e58477e828aad7e43c92 /after/bin/yes
-0f5fe59d628457041d4cb66ba6dfa27dd25c959aa65298db914c2524c9927d52 /after/bin/ls
6c2c4baa6e75c00896b01ceb4e2f0ef62b59a7f27184ac1c5bf85f6da2983ae5 /after/bin/install
+0f5fe59d628457041d4cb66ba6dfa27dd25c959aa65298db914c2524c9927d52 /after/bin/ls
3f43cf65e4ea8b713096607ce7b28c835dacaa0d18bb27fd664156b43b02639a /after/bin/md5sum
7fbafb8ac8aded995076404ea8c35392c3287a4ae92f7683baf445e321ba1a0c /after/bin/mv
5bb0d9ac5acc086b1bbcbd9c2f77f124efcc93e5802194a6aabce05c368b86c4 /after/bin/rm
diff --git a/sysa/coreutils-5.0/coreutils-5.0.kaem b/sysa/coreutils-5.0/coreutils-5.0.kaem
@@ -25,6 +25,7 @@ catm config.h
patch -Np0 -i ../../patches/modechange.patch
patch -Np0 -i ../../patches/mbstate.patch
patch -Np0 -i ../../patches/ls-strcmp.patch
+patch -Np0 -i ../../patches/touch-getdate.patch
# Build and install
/after/bin/make -f Makefile
diff --git a/sysa/coreutils-5.0/coreutils-5.0.sh b/sysa/coreutils-5.0/coreutils-5.0.sh
@@ -13,6 +13,9 @@ src_prepare() {
cp lib/search_.h lib/search.h
touch config.h
+ # Bison pre-generated file
+ rm lib/getdate.c
+
cp "${mk_dir}/pass2.mk" Makefile
}
diff --git a/sysa/coreutils-5.0/mk/main.mk b/sysa/coreutils-5.0/mk/main.mk
@@ -74,7 +74,7 @@ CFLAGS = -I . -I lib \
SRC_DIR=src
-COREUTILS = basename cat chmod cksum csplit cut echo expand factor false fmt fold head id join kill link ln logname mkfifo mkdir mknod nl od paste pathchk printf ptx pwd readlink rmdir seq sleep split sum tail tee touch tr tsort unexpand unlink wc whoami test true yes
+COREUTILS = basename cat chmod cksum csplit cut echo expand factor false fmt fold head id join kill link ln logname mkfifo mkdir mknod nl od paste pathchk printf ptx pwd readlink rmdir seq sleep split sum tail tee tr tsort unexpand unlink wc whoami test touch true yes
BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
@@ -82,7 +82,7 @@ ALL=$(BINARIES) $(SRC_DIR)/cp $(SRC_DIR)/ls $(SRC_DIR)/install $(SRC_DIR)/md5sum
all: $(BINARIES) $(SRC_DIR)/cp $(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
+LIB_SRC = acl 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
LIB_OBJECTS = $(addprefix $(LIB_DIR)/, $(addsuffix .o, $(LIB_SRC)))
diff --git a/sysa/coreutils-5.0/mk/pass2.mk b/sysa/coreutils-5.0/mk/pass2.mk
@@ -83,7 +83,7 @@ CFLAGS = -I . -I lib \
SRC_DIR=src
-COREUTILS = basename cat chmod cksum comm csplit cut date dd dirname echo env expand expr factor false fmt fold head id join kill link ln logname mkfifo mkdir mknod nl od paste pathchk printf ptx pwd readlink rmdir seq sleep sort split sum tail tee touch tr tsort uname unexpand uniq unlink wc whoami test true yes
+COREUTILS = basename cat chmod cksum comm csplit cut dd dirname echo env expand expr factor false fmt fold head id join kill link ln logname mkfifo mkdir mknod nl od paste pathchk printf ptx pwd readlink rmdir seq sleep sort split sum tail tee tr tsort uname unexpand uniq unlink wc whoami test true yes
BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
@@ -91,7 +91,7 @@ ALL=$(BINARIES) $(SRC_DIR)/cp $(SRC_DIR)/ls $(SRC_DIR)/install $(SRC_DIR)/md5sum
all: $(BINARIES) $(SRC_DIR)/cp $(SRC_DIR)/ls $(SRC_DIR)/install $(SRC_DIR)/md5sum $(SRC_DIR)/mv $(SRC_DIR)/rm $(SRC_DIR)/sha1sum
LIB_DIR = lib
-LIB_SRC = acl alloca 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 obstack strverscmp strftime tsearch
+LIB_SRC = acl alloca 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 obstack strverscmp strftime tsearch
LIB_OBJECTS = $(addprefix $(LIB_DIR)/, $(addsuffix .o, $(LIB_SRC)))
diff --git a/sysa/coreutils-5.0/patches/touch-getdate.patch b/sysa/coreutils-5.0/patches/touch-getdate.patch
@@ -0,0 +1,19 @@
+SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+
+SPDX-License-Identifier: GPL-2.0-or-later
+
+getdate.c is pre-compiled from getdate.y
+At this point we don't have bison yet and in any case getdate.y does not
+compile when generated with modern bison.
+
+--- src/touch.c.orig 2021-03-13 18:16:05.344355958 +0000
++++ src/touch.c 2021-03-13 18:16:26.204891355 +0000
+@@ -306,7 +306,7 @@
+
+ case 'd':
+ flexible_date++;
+- newtime = get_date (optarg, NULL);
++ newtime = 0;
+ if (newtime == (time_t) -1)
+ error (EXIT_FAILURE, 0, _("invalid date format %s"), quote (optarg));
+ date_set++;
diff --git a/sysa/coreutils-6.3/coreutils-6.3.sh b/sysa/coreutils-6.3/coreutils-6.3.sh
@@ -9,7 +9,16 @@ src_prepare() {
cp lib/fcntl_.h lib/fcntl.h
sed -i 's#@ABSOLUTE_FCNTL_H@#"/after/include/musl/fcntl.h"#' lib/fcntl.h
- touch config.h lib/configmake.h
+ # Rebuild bison pre-generated file
+ rm lib/getdate.c
+ cd lib
+ bison --update getdate.y
+ bison getdate.y
+ mv getdate.tab.c getdate.c
+ cd ..
+
+ catm config.h
+ catm lib/configmake.h
}
src_compile() {
diff --git a/sysa/coreutils-6.3/mk/main.mk b/sysa/coreutils-6.3/mk/main.mk
@@ -74,13 +74,14 @@ CFLAGS = -I . -I lib \
-Dmajor_t=unsigned \
-Dminor_t=unsigned \
-DHAVE_GETTIMEOFDAY=1 \
+ -DHAVE_TIME_R_POSIX=1 \
-DHASH_ALGO_SHA256
.PHONY: all install
SRC_DIR=src
-COREUTILS =
+COREUTILS = date
BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
@@ -88,7 +89,7 @@ ALL=$(BINARIES) $(SRC_DIR)/sha256sum
all: $(BINARIES) $(SRC_DIR)/sha256sum
LIB_DIR = lib
-LIB_SRC = acl alloca getdate posixtm posixver strftime getopt hash hash-pjw 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 gettime hard-locale human idcache imaxtostr linebuffer localcharset long-options mbswidth md5 memcasecmp memcoll modechange offtostr physmem quote quotearg readtokens rpmatch safe-read safe-write same save-cwd savedir settime sha256 stpcpy stripslash umaxtostr unicodeio userspec version-etc version-etc-fsf xgetcwd xgethostname xmalloc xmemcoll xnanosleep xreadlink xstrtod xstrtol xstrtoul xstrtoimax xstrtoumax yesno strnlen getcwd sig2str mountlist canonicalize mkstemp memrchr euidaccess obstack strverscmp strftime xalloc-die close-stream
+LIB_SRC = acl alloca getdate fprintftime posixtm posixver strftime getopt hash hash-pjw 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 gettime hard-locale human idcache imaxtostr linebuffer localcharset long-options mbswidth md5 memcasecmp memcoll modechange offtostr physmem quote quotearg readtokens rpmatch safe-read safe-write same save-cwd savedir settime sha256 stpcpy stripslash umaxtostr unicodeio userspec version-etc version-etc-fsf xgetcwd xgethostname xmalloc xmemcoll xnanosleep xreadlink xstrtod xstrtol xstrtoul xstrtoimax xstrtoumax yesno strnlen getcwd sig2str mountlist canonicalize mkstemp memrchr euidaccess obstack strverscmp strftime xalloc-die close-stream
LIB_OBJECTS = $(addprefix $(LIB_DIR)/, $(addsuffix .o, $(LIB_SRC)))
