live-bootstrap

commit: f2651ed9d6bce4c9e3e994528e8eabcefe0c6efb
parent 83cbe6731cd4d0ff44b66a2b53b9af90843fa874
Author: Paul Dersey <pdersey@gmail.com>
Date:   Mon, 15 Mar 2021 10:42:20 -0400

tar: remove build dependency on sed

Diffstat:
M
sysa/pre-sha.sha256sums
2
+-
M
sysa/tar-1.12/checksums
2
+-
A
sysa/tar-1.12/files/getdate_stub.c
12
++++++++++++
M
sysa/tar-1.12/tar-1.12.kaem
12
+++++++-----

4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/sysa/pre-sha.sha256sums b/sysa/pre-sha.sha256sums
@@ -15,7 +15,7 @@ e94a2468c045582cfd13df51acd0932afdc834fa60139f7bfb7a2d65afa39a65  /after/bin/mes
 3cf426251744300a099a40f3609ccbd32ec3b9f3334601defa5736e7fd6c6f1d  /after/bin/patch
 b4b16b3314a6f4a8be1b849aba45252e621a7123025dabdf9af6c2d4d657e9b6  /after/bin/sed
 bc9ddf9854bd954c71bb1cf5b0af77fd65b8fa7f290b42c75020fb8893deb53c  /after/bin/sha256sum
-9f83aae8cee866b3af409bb6d28e32d0a04db0e7b64680af4e38b5f43b5ece96  /after/bin/tar
+957229511dc5ac62a949dbd76e965e3a476ce214b8e6fc7f120bf17d195b924b  /after/bin/tar
 690c2a941c444ba761076f6b8ef1ba2b634ebe2e63ea44c8f3789f6e3df6d2a9  /after/bin/tcc
 cacc2cda3ce6c2cc0cb761b8aa2115a003e166c94d1039974fc0221263897c52  /after/bin/tcc-0.9.26
 fc2d3f6a7227836526d278d4e4b642a72c1a83c03c3363f3376100798e0eb145  /after/bin/zcat
diff --git a/sysa/tar-1.12/checksums b/sysa/tar-1.12/checksums
@@ -1 +1 @@
-26761 /after/bin/tar
+3497 /after/bin/tar
diff --git a/sysa/tar-1.12/files/getdate_stub.c b/sysa/tar-1.12/files/getdate_stub.c
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "getdate.h"
+
+time_t get_date (const char *p, const time_t *now)
+{
+    return 0;
+}
diff --git a/sysa/tar-1.12/tar-1.12.kaem b/sysa/tar-1.12/tar-1.12.kaem
@@ -2,11 +2,14 @@
 
 # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 set -ex
 
+cp files/getdate_stub.c src/lib/getdate_stub.c
+
 cd src
 
 # Compile
@@ -19,6 +22,7 @@ tcc -c -DHAVE_DIRENT_H backupfile.c
 tcc -c -I . error.c
 tcc -c -I . fnmatch.c
 tcc -c ftruncate.c
+tcc -c getdate_stub.c
 tcc -c getopt.c
 tcc -c getopt1.c
 tcc -c getversion.c
@@ -28,7 +32,7 @@ tcc -c -DHAVE_GETCWD xgetcwd.c
 tcc -c xmalloc.c
 tcc -c xstrdup.c
 
-tcc -ar cr libtar.a argmatch.o backupfile.o error.o fnmatch.o ftruncate.o getopt.o getopt1.o getversion.o modechange.o msleep.o xgetcwd.o xmalloc.o xstrdup.o
+tcc -ar cr libtar.a argmatch.o backupfile.o error.o fnmatch.o ftruncate.o getdate_stub.o getopt.o getopt1.o getversion.o modechange.o msleep.o xgetcwd.o xmalloc.o xstrdup.o
 cd ..
 
 ## tar
@@ -47,13 +51,11 @@ tcc -c -I lib -DSIZEOF_UNSIGNED_LONG=4 -DHAVE_FCNTL_H -DHAVE_DIRENT_H src/misc.c
 tcc -c -I lib -DSIZEOF_UNSIGNED_LONG=4 -DHAVE_FCNTL_H -DHAVE_GETCWD src/names.c
 tcc -c -I lib -DSIZEOF_UNSIGNED_LONG=4 -DHAVE_FCNTL_H src/open3.c
 tcc -c -I lib -DSIZEOF_UNSIGNED_LONG=4 -DHAVE_FCNTL_H src/rtapelib.c
-cp src/tar.c src/tar_patched.c
-sed -i 709,709d src/tar_patched.c
-tcc -c -I lib -DSIZEOF_UNSIGNED_LONG=4 -DHAVE_FCNTL_H -DPACKAGE=\"tar\" -DVERSION=\"1.12\" src/tar_patched.c
+tcc -c -I lib -DSIZEOF_UNSIGNED_LONG=4 -DHAVE_FCNTL_H -DPACKAGE=\"tar\" -DVERSION=\"1.12\" src/tar.c
 tcc -c -I lib -DSIZEOF_UNSIGNED_LONG=4 -DHAVE_FCNTL_H src/update.c
 
 # Link
-tcc -static -o ${bindir}/tar -L lib lib/libtar.a arith.o buffer.o compare.o create.o delete.o extract.o incremen.o list.o mangle.o misc.o names.o open3.o rtapelib.o tar_patched.o update.o -ltar
+tcc -static -o ${bindir}/tar -L lib lib/libtar.a arith.o buffer.o compare.o create.o delete.o extract.o incremen.o list.o mangle.o misc.o names.o open3.o rtapelib.o tar.o update.o -ltar
 
 cd ..