live-bootstrap

commit: 30ebe8ccba7b635a8bba2001deb7f0827d32cddc
parent 1aeb4c11f714516ad5c348d8f9a6581a892482b9
Author: Andrius Štikonas <andrius@stikonas.eu>
Date:   Sat, 20 Mar 2021 21:21:37 +0000

Install musl headers directly into /after/include.

Diffstat:
M
sysa/bash-5.1/checksums
2
+-
M
sysa/musl-1.1.24/binutils-rebuild.sh
9
+++++++--
M
sysa/tcc-0.9.27/checksums/tcc-musl-pass3
2
+-
M
sysa/tcc-0.9.27/tcc-musl-pass3.sh
3
++-

4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/sysa/bash-5.1/checksums b/sysa/bash-5.1/checksums
@@ -1 +1 @@
-abb6aca766109a7dc2aa00ed976540ce631ad45daa11d5091a38c15dd62f1257  /after/bin/bash
+63487b421c2e2386c526623e4b18605c0f83a419f19e75dec1bb5af109903755  /after/bin/bash
diff --git a/sysa/musl-1.1.24/binutils-rebuild.sh b/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
+}
diff --git a/sysa/tcc-0.9.27/checksums/tcc-musl-pass3 b/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
diff --git a/sysa/tcc-0.9.27/tcc-musl-pass3.sh b/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