Merge pull request #75 from stikonas/gcc

GCC

.cirrus.yml

@@ -26,7 +26,7 @@ reuse_lint_task:
     - reuse lint
 
 run_task:
-  timeout_in: 90m
+  timeout_in: 180m
   container:
     image: potyarkin/molecule:host-kvm
     kvm: true

SHA256SUMS.sources

@@ -19,11 +19,12 @@ e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59  binutils-2.14.
 7007fc89c216fbfaff5525359b02a7e5b612694df5168c74673f67055f015095  bison-3.4.1.tar.gz
 ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269  bzip2-1.0.8.tar.gz
 c25b36b8af6e0ad2a875daf4d6196bd0df28a62be7dd252e5f99a4d5d7288d95  coreutils-5.0.tar.bz2
-8815a918867a14dcfeb623786b3a7f7483a039a78dd5a94e9b562667684c07a1  coreutils-6.3.tar.bz2
+1d013547889f20576460249c4210632d5314531c8477378a2e046b13a8ebeb7e  coreutils-6.10.tar.gz
 d5f2489c4056a31528e3ada4adacc23d498532b0af1a980f2f76158162b139d6  diffutils-2.7.tar.gz
 bc79b890f35ca38d66ff89a6e3758226131e51ccbd10ef78d5ff150b7bd73689  flex-2.5.11.tar.gz
 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995  flex-2.6.4.tar.gz
 5cc35def1ff4375a8b9a98c2ff79e95e80987d24f0d42fdbb7b7039b3ddb3fb0  gawk-3.0.4.tar.gz
+e9bf58c761a4f988311aef6b41f12fd5c7e51d09477468fb73826aecc1be32e7  gcc-4.0.4.tar.bz2
 a32032bab36208509466654df12f507600dfe0313feebbcd218c32a70bf72a16  grep-2.4.tar.gz
 4d2ce9f314f39c9575f913503b0178d6fb2c92920db8e7b7b176b7bab7980fe6  gzip-1.2.4.tar
 9f233d8b78e4351fe9dd2d50d83958a0e5af36f54e9818521458a08e058691ba  heirloom-devtools-070527.tar.bz2
@@ -32,6 +33,7 @@ a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2  help2man-1.36.
 093c993767f563a11e41c1cf887f4e9065247129679d4c1e213d0544d16d8303  m4-1.4.7.tar.gz
 64b30b41fde2ebf669e6af489883fb1df6a06ac30555a96cfa3c39ecce7267dd  make-3.80.tar.gz
 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3  musl-1.1.24.tar.gz
+9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd  musl-1.2.2.tar.gz
 ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a  patch-2.5.9.tar.gz
 1ae43c8d2983404b9eec61c96e3ffa27e7b07e08215c95c015a4ab0095373ef3  perl-5.000.tar.gz
 9fa29beb2fc4a3c373829fc051830796de301f32a719d0b52a400d1719bbd7b1  perl-5.003.tar.gz

parts.rst

@@ -304,13 +304,14 @@ coreutils 5.0
 =============
 
 ``coreutils`` is rebuilt against musl. Additional utilities are built
-including ``comm``, ``expr``, ``date``, ``dd``, ``sort``, ``uname`` and
+including ``comm``, ``expr``, ``dd``, ``sort``, ``sync``, ``uname`` and
 ``uniq``. This fixes a variety of issues with existing ``coreutils``.
 
-coreutils 6.3
+coreutils 6.10
 =============
-We build ``sha256sum`` from coreutils 6.3 since it is absent in 5.0.
-Other utils are not build at this stage.
+We build ``date``, ``mktemp`` and ``sha256sum`` from coreutils 6.10 which are
+either missing or don't build correctly in 5.0. Other utils are not built at
+this stage.
 
 gawk 3.0.4
 ==========
@@ -508,6 +509,27 @@ automake 1.9.6
 Latest GNU Automake from 1.9 series. Slightly annoyingly depends itself but it is easy to patch
 to make it buildable with 1.8.5. Then we rebuild ``automake-1.9`` with itself.
 
+gcc 4.0.4
+=========
+
+The GNU Compiler Collection (GCC) is an optimizing compiler produced by the
+GNU Project. GCC is a key component of the GNU toolchain and the standard
+compiler for most projects related to GNU and the Linux kernel.
+
+Only the C frontend is built at this stage.
+
+musl 1.2.2
+==========
+
+GCC can build the latest as of the time of writing musl version.
+
+We also don't need any of the TCC patches that we used before.
+
+gcc 4.0.4
+=========
+
+Rebuild GCC with GCC and also against the latest musl.
+
 bash 5.1
 ========
 

rootfs.sh

@@ -183,8 +183,8 @@ get_file https://ftp.gnu.org/gnu/grep/grep-2.4.tar.gz
 # diffutils 2.7
 get_file https://ftp.gnu.org/gnu/diffutils/diffutils-2.7.tar.gz
 
-# coreutils 6.3
-get_file https://ftp.gnu.org/gnu/coreutils/coreutils-6.3.tar.bz2
+# coreutils 6.10
+get_file https://ftp.gnu.org/gnu/coreutils/coreutils-6.10.tar.gz
 
 # gawk 3.0.4
 get_file https://ftp.gnu.org/gnu/gawk/gawk-3.0.4.tar.gz
@@ -255,12 +255,18 @@ get_file https://ftp.gnu.org/gnu/help2man/help2man-1.36.4.tar.gz
 # autoconf 2.61
 get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.61.tar.bz2
 
-# bash 5.1
-get_file https://ftp.gnu.org/gnu/bash/bash-5.1.tar.gz
-
 # automake 1.9.6
 get_file https://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2
 
+# gcc 4.0.4
+get_file https://ftp.gnu.org/gnu/gcc/gcc-4.0.4/gcc-core-4.0.4.tar.bz2 0 gcc-4.0.4.tar.bz2
+
+# musl 1.2.2
+get_file https://musl.libc.org/releases/musl-1.2.2.tar.gz
+
+# bash 5.1
+get_file https://ftp.gnu.org/gnu/bash/bash-5.1.tar.gz
+
 # General cleanup
 find tmp -name .git -exec rm -rf \;
 

sysa/bash-5.1/bash-5.1.sh

@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -9,11 +10,14 @@ src_prepare() {
     # Rebuild configure script
     rm configure
     autoconf-2.61
+
+    # Without this bash build can be non-deterministic when using
+    # our old bash 2.05b which was built with Mes C library.
+    sed -i 's/sleep 3/sleep 3; sync/' builtins/psize.sh
 }
 
 src_configure() {
-    CC=tcc CPPFLAGS="-D HAVE_ALLOCA_H" \
-        ./configure --prefix="${PREFIX}" \
+    ./configure --prefix="${PREFIX}" \
         --without-bash-malloc \
         --disable-nls \
         --build=i386-unknown-linux-gnu \
@@ -21,5 +25,5 @@ src_configure() {
 }
 
 src_install() {
-    install bash ${bindir}
+    install bash "${PREFIX}/bin"
 }

sysa/bash-5.1/checksums

@@ -1 +1 @@
-abb6aca766109a7dc2aa00ed976540ce631ad45daa11d5091a38c15dd62f1257  /after/bin/bash
+bf782a82ac8ce393d2a028cec337a4f9428f8ab93d2ae11b026dcc8a027b80a7  /after/bin/bash

sysa/coreutils-5.0/checksums/pass2

@@ -38,6 +38,7 @@ fa7ff4f943ca592c623e41a303e697114a420c0a3e5d91c779dfd57ab39b7053  /after/bin/pwd
 4b7609bd5da6de314b418be80f1be1a525bb4756efb1e9925f0ae7814c6eedef  /after/bin/sleep
 c40dac27f90c5f793a1ed37e78bd1015e44688dc2179da209b1065d02ed0c6e3  /after/bin/sort
 5087a0f86f238062a85f2f6ca3e6b33ba6b3c8dd9700e314c1ae3b2af3331409  /after/bin/split
+533d8a75e4460e37714c50eed989a643dffe08e3ab4f7400b966f2241e28a60f  /after/bin/sync
 35f681f7cc31a895f5c5e0db8b6a3c203b2ed9ce1771503f198614302e42c600  /after/bin/sum
 7272d4fb3313ad3e19c79393d8785d4b343a915e605332eebbc8f5ac5338e071  /after/bin/tail
 c2c6fae2cad8e29a75ff3f793ca7d059cc50ea4ee7d55f659e8f2d371f7763d6  /after/bin/tee

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 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
+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 sync tail tee tr tsort uname unexpand uniq unlink wc whoami test true yes
 
 BINARIES = $(addprefix $(SRC_DIR)/, $(COREUTILS))
 

sysa/coreutils-6.10/checksums

@@ -0,0 +1,3 @@
+98124acfaf5cd8c1795d9557455607fb157a514867de5b908a9a3c8d00d88717  /after/bin/date
+fe8a8a6d39e35ca2d980ac0dfb57204f34c34aa2ec543bc15f93ff80bcbbd38a  /after/bin/mktemp
+40289b9aae91f72a7d44bbc93616dcf2397b60d2532b549d053f3ce9b1040119  /after/bin/sha256sum

sysa/coreutils-6.10/coreutils-6.10.sh

@@ -4,10 +4,7 @@
 
 src_prepare() {
     default_src_prepare
-
-    cp lib/fnmatch_.h lib/fnmatch.h
-    cp lib/fcntl_.h lib/fcntl.h
-    sed -i 's#@ABSOLUTE_FCNTL_H@#"/after/include/musl/fcntl.h"#' lib/fcntl.h 
+    mv lib/fnmatch.in.h lib/fnmatch.h
 
     # Rebuild bison pre-generated file
     rm lib/getdate.c

sysa/coreutils-6.3/checksums

@@ -1 +0,0 @@
-34ec35d9de41dd954802dbcfc7c07697f1e7e3cecedbe32ea16a6da85c3eb260  /after/bin/sha256sum

sysa/gcc-4.0.4/checksums/pass1

@@ -0,0 +1,14 @@
+6ca1ff5a1dd835e2378a8d827c5ec8a68121c7b5c719ab56f71f9d717b8e007e  /after/bin/cpp
+236bb12f3c0b6fb28dee325dfcfcf1cd87dc057aaac307e76a7124c4d071c349  /after/bin/gcc
+236bb12f3c0b6fb28dee325dfcfcf1cd87dc057aaac307e76a7124c4d071c349  /after/bin/i386-unknown-linux-gnu-gcc
+236bb12f3c0b6fb28dee325dfcfcf1cd87dc057aaac307e76a7124c4d071c349  /after/bin/i386-unknown-linux-gnu-gcc-4.0.4
+903b1dae32b217048b1a35a934836496027e6947b77f5711cb8714cd5241dda0  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/cc1
+711689a618e34a0cff2c6061e554f9a2f9d447a7623bd46ba11c2eb816932883  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/collect2
+a3fbed284b1efaf6fccfc81eddd9bad8c4cf07673b16e8885ad6f31a1569c9b4  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/install-tools/fixincl
+de4566c661258fa626ea7076e6c57af95c01d0786bcdadb12af23852cc421a2a  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbegin.o
+c7eea5e845fe2ee5538704d59c6e777d4f72b7100e78d5f86f8d95d96ab2ec20  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginS.o
+de4566c661258fa626ea7076e6c57af95c01d0786bcdadb12af23852cc421a2a  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginT.o
+342276a6ad25e3d064bba9c5d50fbeaae15d0aefdc5c72b1e796366189af1b1b  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtend.o
+2bf001e0be96ea7c53adf35b1bf0a677eee02008e3aee6c30166d100b720687c  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtendS.o
+7b416e87b8e5998c042b64b4b87499720895c17deeffc0bc1b79f6fac502d51b  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcc.a
+efc9783c7386519ef7d5bfe7fadf16d4b6b717deb18dd04e09d810354f015942  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcov.a

sysa/gcc-4.0.4/checksums/pass2

@@ -0,0 +1,14 @@
+22234bd8a949cfab257e10e97a3e990ebb79a75afc5f50e875586bb9367910a7  /after/bin/cpp
+a47e2b29f19aa69b4a40757accd73307f6b51bc9ebcc101aa628906d7c2d3b67  /after/bin/gcc
+a47e2b29f19aa69b4a40757accd73307f6b51bc9ebcc101aa628906d7c2d3b67  /after/bin/i386-unknown-linux-gnu-gcc
+a47e2b29f19aa69b4a40757accd73307f6b51bc9ebcc101aa628906d7c2d3b67  /after/bin/i386-unknown-linux-gnu-gcc-4.0.4
+9d4c0a3b340c1c22b81dd450ef894b02323e059c56cd3ceff423ee316f0ac0a2  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/cc1
+ada38c050d3b2e6e96da2db86dbabebbd2c4cc4bdc2ba258358af9c64e882bed  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/collect2
+7c335c92800b34be9a3add28d529657812f62ec066b4c2a2dcba28c65f6d4e34  /after/libexec/gcc/i386-unknown-linux-gnu/4.0.4/install-tools/fixincl
+a07db1648128987f10debb1730b4456c0423aab5bd93d68e4f2b47447a11c5d9  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbegin.o
+20a3bbbd5cd59b91660628d416d489437463b651fa15b5ea5f026b45c9e35b65  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginS.o
+a07db1648128987f10debb1730b4456c0423aab5bd93d68e4f2b47447a11c5d9  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtbeginT.o
+342276a6ad25e3d064bba9c5d50fbeaae15d0aefdc5c72b1e796366189af1b1b  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtend.o
+2bf001e0be96ea7c53adf35b1bf0a677eee02008e3aee6c30166d100b720687c  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/crtendS.o
+5d3c8a9b80e4e34dfb70a56d6e23a05e01d2ecdbf60232a1b053462d4a98e99e  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcc.a
+f8c3b07e0f98b7f34ac0960d98f3b59ee0f47c42e72c529d10d66dccdc9b5d46  /after/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/libgcov.a

sysa/gcc-4.0.4/pass1.sh

@@ -0,0 +1,85 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_unpack() {
+    default_src_unpack
+}
+
+src_prepare() {
+    default_src_prepare
+    # This is needed for building with TCC
+    sed -i 's/ix86_attribute_table\[\]/ix86_attribute_table\[10\]/' gcc/config/i386/i386.c
+    # Needed for musl
+    sed -i 's/struct siginfo/siginfo_t/' gcc/config/i386/linux-unwind.h
+
+    rm configure
+    autoconf-2.13
+    for dir in intl libcpp; do
+        cd $dir
+        rm aclocal.m4
+        aclocal-1.9 --acdir=../config
+        cd ..
+    done
+    for dir in fixincludes gcc intl libcpp libiberty; do
+        cd $dir
+        rm configure
+        autoconf-2.61
+        cd ..
+    done
+    cd libmudflap
+    autoreconf-2.61 -f
+    cd ..
+
+    for dir in fixincludes intl libmudflap; do
+        cd $dir
+        rm -f config.in
+        autoheader-2.61
+        cd ..
+    done
+
+    # Rebuild libtool files
+    rm config.guess config.sub ltmain.sh
+    libtoolize
+
+    # Rebuild bison files
+    # Workaround for bison being too new
+    sed -i 's/YYLEX/yylex()/' gcc/c-parse.y
+    rm gcc/c-parse.c
+    rm gcc/gengtype-yacc.c gcc/gengtype-yacc.h
+    rm intl/plural.c
+
+    # Rebuild flex generated files
+    rm gcc/gengtype-lex.c
+
+    # Remove translation catalogs
+    rm gcc/po/*.gmo
+}
+
+src_configure() {
+    mkdir build
+    cd build
+    CC=tcc CFLAGS="-D HAVE_ALLOCA_H" ../configure \
+        --prefix="${PREFIX}" \
+        --libdir="${PREFIX}"/lib/musl \
+        --build=i386-unknown-linux-gnu \
+        --host=i386-unknown-linux-gnu \
+        --disable-shared \
+        --disable-nls \
+        --disable-libmudflap
+    cd ..
+
+    sed -i 's/C_alloca/alloca/g' libiberty/alloca.c
+    sed -i 's/C_alloca/alloca/g' include/libiberty.h
+}
+
+src_compile() {
+    mkdir -p /usr/
+    ln -sf "${PREFIX}"/include /usr/include
+    make -C build LIBGCC2_INCLUDES=-I"${PREFIX}/include/musl"
+}
+
+src_install() {
+    make -C build install
+}

sysa/gcc-4.0.4/pass2.sh

@@ -0,0 +1,81 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_unpack() {
+    default_src_unpack
+}
+
+src_prepare() {
+    default_src_prepare
+
+    # Needed for musl
+    sed -i 's/struct siginfo/siginfo_t/' gcc/config/i386/linux-unwind.h
+
+    rm configure
+    autoconf-2.13
+    for dir in intl libcpp; do
+        cd $dir
+        rm aclocal.m4
+        aclocal-1.9 --acdir=../config
+        cd ..
+    done
+    for dir in fixincludes gcc intl libcpp libiberty; do
+        cd $dir
+        rm configure
+        autoconf-2.61
+        cd ..
+    done
+    cd libmudflap
+    autoreconf-2.61 -f
+    cd ..
+
+    for dir in fixincludes intl libmudflap; do
+        cd $dir
+        rm -f config.in
+        autoheader-2.61
+        cd ..
+    done
+
+    # Rebuild libtool files
+    rm config.guess config.sub ltmain.sh
+    libtoolize
+
+    # Rebuild bison files
+    # Workaround for bison being too new
+    sed -i 's/YYLEX/yylex()/' gcc/c-parse.y
+    rm gcc/c-parse.c
+    rm gcc/gengtype-yacc.c gcc/gengtype-yacc.h
+    rm intl/plural.c
+
+    # Rebuild flex generated files
+    rm gcc/gengtype-lex.c
+
+    # Remove translation catalogs
+    rm gcc/po/*.gmo
+}
+
+src_configure() {
+    mkdir build
+    cd build
+    ../configure \
+        --prefix="${PREFIX}" \
+        --libdir="${PREFIX}"/lib/musl \
+        --build=i386-unknown-linux-gnu \
+        --host=i386-unknown-linux-gnu \
+        --disable-shared \
+        --disable-nls \
+        --disable-libmudflap
+    cd ..
+}
+
+src_compile() {
+    mkdir -p /usr/
+    ln -sf "${PREFIX}"/include /usr/include
+    make -C build LIBGCC2_INCLUDES=-I"${PREFIX}/include/musl"
+}
+
+src_install() {
+    make -C build install
+}

sysa/musl-1.1.24/binutils-rebuild.sh

@@ -14,8 +14,8 @@ src_configure() {
       --host=i386 \
       --disable-shared \
       --prefix=/after \
-      --libdir=/after/lib/musl/ \
-      --includedir=/after/include/musl
+      --libdir=/after/lib/musl \
+      --includedir=/after/include/
 
     # configure script creates this file
     test -f /dev/null && rm /dev/null
@@ -24,3 +24,8 @@ src_configure() {
 src_compile() {
     make CROSS_COMPILE= CFLAGS="-DSYSCALL_NO_TLS" AS_CMD='as -o $@ $<'
 }
+
+src_install() {
+    rm -rf /after/include
+    make install
+}

sysa/musl-1.2.2/checksums

@@ -0,0 +1,14 @@
+40e7962d82241e166dba1b12a7c4c0658ec8ade4e7b93e20a57485811a92f366  /after/lib/musl/Scrt1.o
+13ae7b4895a3ce59ab6b8219e03b5e65ca3d9400b673325c1df86d75bb1b9ff9  /after/lib/musl/crt1.o
+73f64b61e6e9ae83726ab4cc909a7b549b06b6df2b087aedddbcd39cb7146f69  /after/lib/musl/crti.o
+f5e325819d86fb381574692b8f9ea24f88f44f185a75adfe461705ecf2619c6e  /after/lib/musl/crtn.o
+15b76dac0837370a1d1dea59e4570d15c1a5ab522810b758e3f32518975c9be3  /after/lib/musl/libc.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /after/lib/musl/libcrypt.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /after/lib/musl/libdl.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /after/lib/musl/libm.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /after/lib/musl/libpthread.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /after/lib/musl/libresolv.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /after/lib/musl/librt.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /after/lib/musl/libutil.a
+f0a17a43c74d2fe5474fa2fd29c8f14799e777d7d75a2cc4d11c20a6e7b161c5  /after/lib/musl/libxnet.a
+ee385035a4d9b3f4f9a1c73148821ddf26a1b3c2e607aa948c70d8612559cf7d  /after/lib/musl/rcrt1.o

sysa/musl-1.2.2/musl-1.2.2.sh

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_configure() {
+    CC=gcc ./configure \
+        --host=i386 \
+        --disable-shared \
+        --prefix=/after \
+        --libdir=/after/lib/musl \
+        --includedir=/after/include/
+
+    # configure script creates this file
+    test -f /dev/null && rm /dev/null && mknod -m 666 /dev/null c 1 3
+}
+
+src_compile() {
+    make CROSS_COMPILE=
+}

sysa/run.sh

@@ -57,8 +57,8 @@ build diffutils-2.7
 # Rebuild coreutils using musl
 build coreutils-5.0 coreutils-5.0.sh checksums/pass2
 
-# Build only sha256sum
-build coreutils-6.3
+# Build only date, mktemp and sha256sum
+build coreutils-6.10
 
 build gawk-3.0.4
 
@@ -126,6 +126,15 @@ build help2man-1.36.4
 build autoconf-2.61 stage1.sh
 build autoconf-2.61 stage2.sh
 
+build automake-1.9.6 stage1.sh
+build automake-1.9.6 stage2.sh
+
+build gcc-4.0.4 pass1.sh checksums/pass1
+
+build musl-1.2.2
+
+build gcc-4.0.4 pass2.sh checksums/pass2
+
 build bash-5.1
 
-exec bash run2.sh
+exec env -i PATH=/after/bin PREFIX=/after bash run2.sh

sysa/run2.sh

@@ -7,10 +7,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 set -e
-. helpers.sh
 
-build automake-1.9.6 stage1.sh
-build automake-1.9.6 stage2.sh
+. helpers.sh
 
 echo "Bootstrapping completed."
 

sysa/tcc-0.9.27/checksums/tcc-musl-pass3

@@ -1,2 +1,2 @@
-f8023d637f64e1e739b5f381a000eafb0f2e500dc7967ebd90642d4a13c755f8  /after/bin/tcc-musl
+fd8fdc967f227f3a8ef4f51226ac8a45b6be78eb0b127d2cdf0a9df0e19451b0  /after/bin/tcc-musl
 a650b13efc65073fb851e9db89728089d8845c401f85faaa09801874ab058089  /after/lib/tcc/libtcc1.a

sysa/tcc-0.9.27/tcc-musl-pass1.sh

@@ -45,8 +45,8 @@ src_compile() {
 }
 
 src_install() {
-    # Remove old tcc binaries, keep one for tcc-0.9.27 with mes C library
-    mv ${bindir}/tcc ${bindir}/tcc-mes
+    # Remove old tcc binaries
+    rm ${bindir}/tcc
     rm ${bindir}/boot*-tcc ${bindir}/tcc-0.9.26 ${bindir}/mes-tcc
     ln -s ${bindir}/tcc-musl ${bindir}/tcc
 }

sysa/tcc-0.9.27/tcc-musl-pass3.sh

@@ -14,7 +14,7 @@ src_prepare() {
 src_compile() {
     export prefix=/after
     export libdir=${prefix}/lib/musl
-    export incdir=${prefix}/include/musl
+    export incdir=${prefix}/include
     export bindir=${prefix}/bin
 
     mkdir -p ${libdir}/tcc
@@ -34,6 +34,7 @@ src_compile() {
         -D CONFIG_USE_LIBGCC=1 \
         -D TCC_VERSION=\"0.9.27\" \
         -D ONE_SOURCE=1 \
+        -I ${incdir} \
         tcc.c
 
     # libtcc1.a