Built patch and made progress with rustc

2 files changed, 77 insertions, 25 deletions

diff --git a/build-chroot.sh b/build-chroot.sh
index 71f4203..7ad14c4 100755
--- a/build-chroot.sh
+++ b/build-chroot.sh
@@ -310,7 +310,7 @@ tar xf ../sources/dosfstools-*.tar*
 cd dosfstools-*/
 ./configure \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -324,7 +324,7 @@ cd bison-*/
 ./configure \
 	--disable-nls \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -339,7 +339,7 @@ cd flex-*/
 	--disable-nls \
 	--disable-static \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -361,7 +361,7 @@ cd util-linux-*
 	--disable-static \
 	--disable-use-tty-group \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc \
@@ -388,7 +388,7 @@ cd userspace-rcu-*/
 ./configure \
 	--disable-static \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -405,7 +405,7 @@ CFLAGS=-DOVERRIDE_SYSTEM_STATX ./configure \
 	--disable-static \
 	--enable-gettext=no \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -418,7 +418,7 @@ tar xf ../sources/bc-*.tar*
 cd bc-*/
 ./configure \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -496,7 +496,7 @@ cd procps-ng-*/
 	--disable-static \
 	--enable-year2038 \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc \
@@ -519,7 +519,7 @@ cd kbd-*/
 	--disable-static \
 	--disable-tests \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -544,7 +544,7 @@ cd libmd-*/
 ./configure \
 	--disable-static \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -559,7 +559,7 @@ cd libbsd-*/
 	--disable-static \
 	--enable-year2038 \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -574,7 +574,7 @@ cd shadow-*/
 	--disable-nls \
 	--disable-static \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -590,7 +590,7 @@ cd nano-*/
 	--enable-utf8 \
 	--enable-year2038 \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -604,7 +604,7 @@ cd libsodium-*/
 ./configure \
 	--disable-static \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -664,7 +664,7 @@ cd libmnl-*/
 ./configure \
 	--disable-static \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -678,7 +678,7 @@ cd libnftnl-*/
 ./configure \
 	--disable-static \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -693,7 +693,7 @@ cd gmp-*/
 	--disable-static \
 	--enable-cxx \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc
@@ -709,7 +709,7 @@ cd nftables-*/
 ./configure \
 	--disable-static \
 	--exec-prefix="" \
-	--libexecdir=/usr/lib \
+	--libexecdir=/lib \
 	--localstatedir=/var \
 	--prefix=/usr \
 	--sysconfdir=/etc \
@@ -718,6 +718,19 @@ make -j $THREADS
 make -j $THREADS install
 cd ..
 
+# patch Build
+tar xf ../sources/patch-*.tar*
+cd patch-*/
+./configure \
+	--exec-prefix="" \
+	--libexecdir=/lib \
+	--localstatedir=/var \
+	--prefix=/usr \
+	--sysconfdir=/etc
+make -j $THREADS
+make -j $THREADS install
+cd ..
+
 # rustc Build With mrustc Bootstrap
 tar xf ../sources/mrustc-*.tar*
 cd mrustc-*/
@@ -730,12 +743,50 @@ tar xf ../../sources/rustc-*.tar*
 # NOTE: minicargo.mk makes a *lot* of assumptions about the build environment
 #       and most of them are incorrect in our case. As a result, we're stuck
 #       with building rustc ourselves. ~ahill
-./bin/minicargo --vendor-dir rustc-*-src/vendor --output-dir $(pwd)/build ./rustc-*-src/library/std
-./bin/minicargo --vendor-dir rustc-*-src/vendor --output-dir $(pwd)/build ./rustc-*-src/library/panic_unwind
-./bin/minicargo --vendor-dir rustc-*-src/vendor --output-dir $(pwd)/build ./rustc-*-src/library/test
-./bin/minicargo --output-dir $(pwd)/build lib/libproc_macro
-./bin/minicargo rustc-*-src/compiler/rustc_driver --vendor-dir rustc-*-src/vendor --output-dir $(pwd)/build -L $(pwd)/build
-./bin/minicargo rustc-*-src/src/tools/cargo --vendor-dir rustc-*-src/vendor --output-dir $(pwd)/build -L $(pwd)/build
+cd rustc-*-src/
+RUST_VERSION=$(pwd | sed -r "s/.*rustc-(.*)-src/\1/")
+patch -p0 < ../rustc-$RUST_VERSION-src.patch
+cd ..
+./bin/minicargo \
+	--vendor-dir rustc-*-src/vendor \
+	--script-overrides script-overrides/stable-$RUST_VERSION-linux \
+	--output-dir $(pwd)/build \
+	--manifest-overrides rustc-$RUST_VERSION-overrides.toml \
+	-j $THREADS \
+	./rustc-*-src/library/std
+./bin/minicargo \
+	--vendor-dir rustc-*-src/vendor \
+	--script-overrides script-overrides/stable-$RUST_VERSION-linux \
+	--output-dir $(pwd)/build \
+	--manifest-overrides rustc-$RUST_VERSION-overrides.toml \
+	-j $THREADS \
+	./rustc-*-src/library/panic_unwind
+./bin/minicargo --vendor-dir rustc-*-src/vendor \
+	--script-overrides script-overrides/stable-$RUST_VERSION-linux \
+	--output-dir $(pwd)/build \
+	--manifest-overrides rustc-$RUST_VERSION-overrides.toml \
+	-j $THREADS \
+	./rustc-*-src/library/test
+./bin/minicargo \
+	--output-dir $(pwd)/build \
+	--manifest-overrides rustc-$RUST_VERSION-overrides.toml \
+	-j $THREADS \
+	lib/libproc_macro
+./bin/minicargo \
+	--vendor-dir rustc-*-src/vendor \
+	--output-dir $(pwd)/build \
+	-L $(pwd)/build \
+	--manifest-overrides rustc-$RUST_VERSION-overrides.toml \
+	-j $THREADS \
+	rustc-*-src/compiler/rustc_driver
+./bin/minicargo \
+	--vendor-dir rustc-*-src/vendor \
+	--output-dir $(pwd)/build \
+	-L $(pwd)/build \
+	--manifest-overrides rustc-$RUST_VERSION-overrides.toml \
+	-j $THREADS \
+	--features vendored-openssl \
+	rustc-*-src/src/tools/cargo
 # ...
 cd ..
 
diff --git a/sources.list b/sources.list
index db68ca5..864725d 100644
--- a/sources.list
+++ b/sources.list
@@ -46,10 +46,11 @@ a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4,https://musl.li
 97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059,https://invisible-island.net/datafiles/release/ncurses.tar.gz,ncurses-6.3.tar.gz
 9c8a64b59c90b0825e540a9b8fcb9d2d942c636f81ba50199f068fde44f34ed8,https://www.netfilter.org/pub/nftables/nftables-1.1.3.tar.xz,
 98ccfea6780973dfc662452dab507fe724444f92993b19fb79f0448542d5c92b,https://github.com/OpenRC/openrc/archive/refs/tags/0.62.tar.gz,openrc-0.62.tar.gz
+f87cee69eec2b4fcbf60a396b030ad6aa3415f192aa5f7ee84cad5e11f7f5ae3,https://ftp.gnu.org/gnu/patch/patch-2.8.tar.xz,
 10d4647cfbb543a7f9ae3e5f6851ec49305232ea7621aed24c7cfbb0bef4b70d,https://www.cpan.org/src/5.0/perl-5.40.2.tar.gz,
 51203d99ed573fa7344bf07ca626f10c7cc094e0846ac4aa0023bd0c83c25a41,https://distfiles.ariadne.space/pkgconf/pkgconf-2.4.3.tar.xz,
 c2e6d193cc78f84cd6ddb72aaf6d5c6a9162f0470e5992092057f5ff518562fa,https://cfhcable.dl.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.5.tar.xz,
-d939eada065dc827a9d4dbb55bd48533ad14c16e7f0a42e70147029c82a7707b,https://static.rust-lang.org/dist/rustc-1.86.0-src.tar.xz,
+23705e38c1a37acfd7fbb921c5dd8772619476e80d0b3b39ac8eb45bc0c33187,https://static.rust-lang.org/dist/rustc-1.74.0-src.tar.xz,
 3b8cf51548dfc49b7efe035e191ff5e1963ebc4fe8f6064a5eefc5343eaf78a5,https://github.com/michaelforney/samurai/releases/download/1.2/samurai-1.2.tar.gz,
 6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181,https://ftp.gnu.org/gnu/sed/sed-4.9.tar.xz,
 554801054694ff7d8a7abdf0d6ece34e2f16e111673cc01b8c9ee1278451181e,https://github.com/shadow-maint/shadow/releases/download/4.17.4/shadow-4.17.4.tar.xz,