mirror/maplelinux-bootstrap
1
0
Fork 0
mirror of https://linux.maple.camp/git/ahill/maplelinux-bootstrap.git synced 2026-02-11 10:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated openssl-sys and built cargo

Browse Source 
Now rustc and cargo are segfaulting. Fantastic.
This commit is contained in:
Alexander Hill
2025-05-04 15:10:03 -04:00
parent 3dba013893
commit 715c961798
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build-chroot.sh
View File

@@ -738,7 +738,7 @@ make -j $THREADS
make -j $THREADS install make -j $THREADS install
cd .. cd ..
# rustc Build With mrustc Bootstrap # rustc Build With mrustc Bootstrap (Thank you Mutabah for all of your help!)
tar xf ../sources/mrustc-*.tar* tar xf ../sources/mrustc-*.tar*
cd mrustc-*/ cd mrustc-*/
# NOTE: Using types such as uint8_t without stdint.h is not portable. ~ahill # NOTE: Using types such as uint8_t without stdint.h is not portable. ~ahill
@@ -832,7 +832,14 @@ RUSTC_INSTALL_BINDIR=bin \
-L $(pwd)/build-std \ -L $(pwd)/build-std \
--manifest-overrides rustc-$RUST_VERSION-overrides.toml \ --manifest-overrides rustc-$RUST_VERSION-overrides.toml \
-j $THREADS \ -j $THREADS \
rustc-$RUST_VERSION-src/compiler/rustc_driver rustc-$RUST_VERSION-src/compiler/rustc
# NOTE: openssl-sys supports LibreSSL, but the version shipped with this version
# of rustc only supports up to LibreSSL 3.8.0. We are manually updating
# this crate so cargo can be built without downgrading LibreSSL. ~ahill
cd rustc-$RUST_VERSION-src/vendor
rm -rf openssl-sys*
tar xf ../../../../sources/openssl-sys-*.crate
cd ../..
./bin/minicargo \ ./bin/minicargo \
--vendor-dir rustc-$RUST_VERSION-src/vendor \ --vendor-dir rustc-$RUST_VERSION-src/vendor \
--output-dir $(pwd)/build-cargo \ --output-dir $(pwd)/build-cargo \
@@ -840,7 +847,8 @@ RUSTC_INSTALL_BINDIR=bin \
--manifest-overrides rustc-$RUST_VERSION-overrides.toml \ --manifest-overrides rustc-$RUST_VERSION-overrides.toml \
-j $THREADS \ -j $THREADS \
rustc-$RUST_VERSION-src/src/tools/cargo rustc-$RUST_VERSION-src/src/tools/cargo
# ... cp build-rustc/rustc_main /bin/rustc
cp build-cargo/cargo /bin/
cd .. cd ..
# Basic Configuration # Basic Configuration

1
sources.list
View File

@@ -46,6 +46,7 @@ a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4,https://musl.li
97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059,https://invisible-island.net/datafiles/release/ncurses.tar.gz,ncurses-6.3.tar.gz 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, 9c8a64b59c90b0825e540a9b8fcb9d2d942c636f81ba50199f068fde44f34ed8,https://www.netfilter.org/pub/nftables/nftables-1.1.3.tar.xz,
bddb0fe1c0cc5074439255d17ae92eeb989322f02eac0536f4924b9d96cd73a0,https://github.com/OpenRC/openrc/archive/refs/tags/0.62.2.tar.gz,openrc-0.62.2.tar.gz bddb0fe1c0cc5074439255d17ae92eeb989322f02eac0536f4924b9d96cd73a0,https://github.com/OpenRC/openrc/archive/refs/tags/0.62.2.tar.gz,openrc-0.62.2.tar.gz
e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847,https://crates.io/api/v1/crates/openssl-sys/0.9.108/download,openssl-sys-0.9.108.crate
f87cee69eec2b4fcbf60a396b030ad6aa3415f192aa5f7ee84cad5e11f7f5ae3,https://ftpmirror.gnu.org/gnu/patch/patch-2.8.tar.xz, f87cee69eec2b4fcbf60a396b030ad6aa3415f192aa5f7ee84cad5e11f7f5ae3,https://ftpmirror.gnu.org/gnu/patch/patch-2.8.tar.xz,
10d4647cfbb543a7f9ae3e5f6851ec49305232ea7621aed24c7cfbb0bef4b70d,https://www.cpan.org/src/5.0/perl-5.40.2.tar.gz, 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, 51203d99ed573fa7344bf07ca626f10c7cc094e0846ac4aa0023bd0c83c25a41,https://distfiles.ariadne.space/pkgconf/pkgconf-2.4.3.tar.xz,