Skip to content

Commit d2e9d0f

Browse files
tobtohttobtoht
committed
don't re-bootstrap rustc
1 parent d238c24 commit d2e9d0f

File tree

11 files changed

+54
-129
lines changed

11 files changed

+54
-129
lines changed

‎contrib/depends/packages/fcmp_pp_rust_deps.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package=fcmp_pp_rust_deps
22
$(package)_version=0.0.0
33
$(package)_download_path=https://featherwallet.org/files/sources
44
$(package)_file_name=fcmp_pp_rust-$($(package)_version)-deps.tar.gz
5-
$(package)_sha256_hash=b25a4b18e18923faf3e8e8508dd72154ed4824a5a50d82b1cec7884fd850710d
5+
$(package)_sha256_hash=9a7c20d5571c0a82fe570122b4166dd4223672baaa1e25e52eb2426eefe3bc02
66

77
define $(package)_stage_cmds
88
mkdir -p $($(package)_staging_prefix_dir)/cargo &&\

‎contrib/depends/packages/libusb.mk‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,20 @@ $(package)_version=1.0.27
33
$(package)_download_path=https://github.com/libusb/libusb/releases/download/v$($(package)_version)
44
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
55
$(package)_sha256_hash=ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575
6+
$(package)_patches=no-c11.patch
67

7-
define $(package)_preprocess_cmds
8-
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
9-
autoreconf -i
10-
endef
8+
ifeq ($(host_os),darwin)
9+
define $(package)_preprocess_cmds
10+
patch -p1 < $($(package)_patch_dir)/no-c11.patch && \
11+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
12+
autoreconf -i
13+
endef
14+
else
15+
define $(package)_preprocess_cmds
16+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . && \
17+
autoreconf -i
18+
endef
19+
endif
1120

1221
define $(package)_set_vars
1322
$(package)_config_opts=--disable-shared

‎contrib/depends/packages/rustc.mk‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,13 @@ $(package)_version=1.77.1
33
$(package)_download_path=https://static.rust-lang.org/dist
44
$(package)_file_name=rustc-$($(package)_version)-src.tar.gz
55
$(package)_sha256_hash=ee106e4c569f52dba3b5b282b105820f86bd8f6b3d09c06b8dce82fb1bb3a4a1
6-
$(package)_patches=config.toml
7-
$(package)_freebsd_dependencies=freebsd_base native_binutils
8-
$(package)_android_dependencies=android_ndk
9-
$(package)_darwin_dependencies=darwin_sdk
10-
11-
define $(package)_set_vars
12-
$(package)_stage_env_freebsd=AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd11-ar
13-
$(package)_stage_env_freebsd+=CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd11-clang
14-
$(package)_stage_env_freebsd+=CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd11-clang++
15-
$(package)_stage_env_aarch64_android=CC_aarch64_linux_android="$(host_toolchain)clang"
16-
$(package)_stage_env_aarch64_android+=CXX_aarch64_linux_android="$(host_toolchain)clang++"
17-
$(package)_stage_env_arm_android=CC_armv7_linux_androideabi="$(host_toolchain)clang"
18-
$(package)_stage_env_arm_android+=CXX_armv7_linux_androideabi="$(host_toolchain)clang++"
19-
$(package)_stage_env_darwin=CC_x86_64_apple_darwin=x86_64-apple-darwin-clang
20-
$(package)_stage_env_darwin+=CXX_x86_64_apple_darwin=x86_64-apple-darwin-clang++
21-
$(package)_stage_env_darwin+=AR_x86_64_apple_darwin=llvm-ar
22-
$(package)_stage_env_darwin=CC_aarch64_apple_darwin=aarch64-apple-darwin-clang
23-
$(package)_stage_env_darwin+=CXX_aarch64_apple_darwin=aarch64-apple-darwin-clang++
24-
$(package)_stage_env_darwin+=AR_aarch64_apple_darwin=llvm-ar
25-
endef
26-
27-
define $(package)_config_cmds
28-
endef
29-
30-
# Remove blobs from source
31-
# TODO: script here could be less messy
6+
$(package)_patches=deblob.sh
327

338
define $(package)_preprocess_cmds
34-
rm -rf src/llvm-project && \
35-
find . -type f -regex ".*\.\(a\|dll\|exe\|lib\)$$$$" -delete && \
36-
find . -type f -name ".cargo-checksum.json" -print0 | xargs -0 -I% sh -c 'echo "{\"files\":{}}" > "%"' && \
37-
find . -type f -name "Cargo.lock" -delete && \
38-
sed -i 's/args.append("--frozen")/pass/g' src/bootstrap/bootstrap.py && \
39-
sed -i 's/cargo.arg("--frozen");//g' src/bootstrap/src/core/builder.rs && \
40-
cp $($(package)_patch_dir)/config.toml . && \
41-
sed -i "s/TARGET/${RUST_TARGET}/g" config.toml && \
42-
sed -i "s#PREFIX#$($(package)_staging_prefix_dir)#g" config.toml
9+
bash $($(package)_patch_dir)/deblob.sh
4310
endef
4411

4512
define $(package)_stage_cmds
46-
python3 ./x.py install
13+
mkdir -p $($(package)_staging_prefix_dir)/rust &&\
14+
mv * $($(package)_staging_prefix_dir)/rust
4715
endef

‎contrib/depends/patches/rustc/config.toml‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎contrib/depends/patches/rustc/deblob.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
3+
#TODO: add comments
4+
5+
# We do not need to build llvm-project from source
6+
rm -rf src/llvm-project
7+
8+
# Remove all .a/.dll/.exe/.lib files, this covers all remaining binaries
9+
find . -type f -regex ".*\.\(a\|dll\|exe\|lib\)$" -delete
10+
11+
find . -type f -name ".cargo-checksum.json" -print0 | xargs -0 -I% sh -c 'echo "{\"files\":{}}" > "%"'
12+
13+
find . -type f -name "Cargo.lock" -delete
14+
15+
sed -i 's/args.append("--frozen")/pass/g' src/bootstrap/bootstrap.py
16+
17+
sed -i 's/cargo.arg("--frozen");//g' src/bootstrap/src/core/builder.rs

‎contrib/depends/toolchain.cmake.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ SET(Boost_USE_STATIC_RUNTIME ON)
5757
SET(OPENSSL_ROOT_DIR @prefix@)
5858
SET(ARCHITECTURE @arch@)
5959
SET(TARGET_OS @host_os@)
60+
SET(DEPENDS_HOST @HOST@)
6061

6162
# for libraries and headers in the target directories
6263
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host

‎contrib/guix/cargo.scm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
((gnu packages certs) #:select (nss-certs))
44
(gnu packages rust)
55
(gnu packages compression)
6+
(gnu packages wget)
67
((gnu packages tls) #:select (openssl)))
78

89
(packages->manifest
@@ -15,4 +16,5 @@
1516
openssl
1617
tar
1718
gzip
19+
wget
1820
(list rust "cargo"))))

‎contrib/guix/libexec/cargo.sh‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,20 @@ export SOURCE_DATE_EPOCH=1397818193
77
export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
88
export TZ="UTC"
99

10+
cd /
11+
wget --no-check-certificate https://static.rust-lang.org/dist/rustc-1.77.1-src.tar.gz
12+
echo "ee106e4c569f52dba3b5b282b105820f86bd8f6b3d09c06b8dce82fb1bb3a4a1 rustc-1.77.1-src.tar.gz" | sha256sum -c
13+
tar xf rustc-1.77.1-src.tar.gz
14+
cp rustc-1.77.1-src/Cargo.lock rustc-1.77.1-src/library/std/
15+
1016
# Vendor fcmp_pp_rust deps
1117
cd /monero/src/fcmp_pp/fcmp_pp_rust
12-
cargo vendor --locked /vendor
18+
RUSTC_BOOTSTRAP=1 cargo vendor --locked --sync /rustc-1.77.1-src/library/std/Cargo.toml /vendor
1319

1420
# Create deterministic dependency archive
1521
cd /vendor
22+
rm -rf windows*
23+
find . -type f -regex ".*\.\(a\|dll\|exe\|lib\)$" -delete
1624
find . -print0 \
1725
| sort --zero-terminated \
1826
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \

‎contrib/guix/libexec/config.toml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎contrib/guix/manifest.scm‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,11 @@ chain for " target " development."))
222222
(("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix)
223223
(string-append out "/etc/rpc" suffix "\n"))
224224
(("^install-others =.*$")
225-
(string-append "install-others = " out "/etc/rpc\n"))))))))))))
225+
(string-append "install-others = " out "/etc/rpc\n"))))))))))
226+
(native-inputs
227+
(modify-inputs (package-native-inputs glibc-2.31)
228+
(delete "make")
229+
(append gnu-make-4.2))))) ;; make >= 4.4 causes an infinite loop (stdio-common)
226230

227231
(packages->manifest
228232
(append

0 commit comments

Comments
 (0)