live-bootstrap

commit: 3518f7cec01af61b53343acff0b4fc7eb172bad6
parent 07dcb910b96b3b67238d0f197d52da941ef02c24
Author: Andrius Štikonas <andrius@stikonas.eu>
Date:   Thu, 11 Mar 2021 18:12:52 +0000

Buil sed 4.0.9 with musl.

Diffstat:
M
SHA256SUMS.sources
1
+
M
parts.rst
5
+++++
M
rootfs.sh
3
+++
M
sysa/run.sh
3
+++
A
sysa/sed-4.0.9/checksums
1
+
A
sysa/sed-4.0.9/mk/main.mk
33
+++++++++++++++++++++++++++++++++
A
sysa/sed-4.0.9/sed-4.0.9.sh
14
++++++++++++++

7 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
@@ -25,5 +25,6 @@ ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a  patch-2.5.9.ta
 1184478b298978b164a383ed5661e3a117c48ab97d6d0ab7ef614cdbe918b9eb  perl5.004_05.tar.gz
 93f41cd87ab8ee83391cfa39a63b076adeb7c3501d2efa31b98d0ef037122bd1  perl5.005_03.tar.gz
 a5e66f6ebf701b0567f569f57cae82abf5ce57af70a2b45ae71323b61f49134e  perl-5.6.2.tar.gz
+c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600  sed-4.0.9.tar.gz
 404a8d72427a559c074e581bf8f7d5a73283faf249cd3faf6dc1c6faf97d07c7  sha-2-61555d.tar.gz
 c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a  tar-1.12.tar.gz
diff --git a/parts.rst b/parts.rst
@@ -251,6 +251,11 @@ tcc 0.9.27 (musl v2)
 Now that we have a ‘fixed’ ``musl``, we now recompile ``tcc`` as ``tcc``
 uses floats extensively.
 
+sed 4.0.9
+=========
+
+A slightly newer ``sed`` is built against musl.
+
 .. _bzip2-1.0.8-1:
 
 bzip2 1.0.8
diff --git a/rootfs.sh b/rootfs.sh
@@ -222,6 +222,9 @@ get_file https://ftp.gnu.org/gnu/binutils/binutils-2.14.tar.bz2
 # bash 3.2.57
 get_file https://ftp.gnu.org/gnu/bash/bash-3.2.57.tar.gz
 
+# sed 4.0.9
+get_file ftp://ftp.gnu.org/gnu/sed/sed-4.0.9.tar.gz
+
 # General cleanup
 find tmp -name .git -exec rm -rf \;
 
diff --git a/sysa/run.sh b/sysa/run.sh
@@ -36,6 +36,9 @@ build musl-1.1.24 musl-1.1.24.sh checksums/pass2
 # Rebuild tcc-musl using new musl
 build tcc-0.9.27 tcc-musl-pass2.sh checksums/tcc-musl-pass2
 
+# Rebuild sed using musl
+build sed-4.0.9
+
 # Rebuild bzip2 using musl
 build bzip2-1.0.8 bzip2-1.0.8.sh checksums/bzip2-pass2
 
diff --git a/sysa/sed-4.0.9/checksums b/sysa/sed-4.0.9/checksums
@@ -0,0 +1 @@
+de7d06a5c0b0a4b52307771f60dd711d0ae9ae0b14562ad6d26942785aaf0909  /after/bin/sed
diff --git a/sysa/sed-4.0.9/mk/main.mk b/sysa/sed-4.0.9/mk/main.mk
@@ -0,0 +1,33 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+CC = tcc
+AR = tcc -ar
+
+CPPFLAGS = -DENABLE_NLS=0 \
+         -DHAVE_FCNTL_H \
+         -DHAVE_ALLOCA_H \
+         -DSED_FEATURE_VERSION=\"4.0\" \
+         -DVERSION=\"4.0.9\" \
+         -DPACKAGE=\"sed\"
+CFLAGS = -I . -I lib
+
+.PHONY: all
+
+LIB_SRC = alloca getopt1 getopt utils regex obstack strverscmp mkstemp
+LIB_OBJ = $(addprefix lib/, $(addsuffix .o, $(LIB_SRC)))
+
+SED_SRC = compile execute regexp fmt sed
+SED_OBJ = $(addprefix sed/, $(addsuffix .o, $(SED_SRC)))
+
+all: sed/sed
+
+libsed.a: $(LIB_OBJ)
+	$(AR) cr $@ $^
+
+sed/sed: $(SED_OBJ) libsed.a
+	$(CC) -o $@ $^
+
+install:
+	install sed/sed $(PREFIX)/bin
diff --git a/sysa/sed-4.0.9/sed-4.0.9.sh b/sysa/sed-4.0.9/sed-4.0.9.sh
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    default_src_prepare
+
+    cp lib/regex_.h lib/regex.h
+    touch config.h
+}
+
+src_install() {
+    default_src_install
+}