|
|
@@ -9,7 +9,7 @@
|
|
|
# Some sub-packages are versioned independently of the rust compiler and runtime itself.
|
|
|
# Also beware that if any of these are not changed in a version bump, then the release
|
|
|
# number should still increase, not be reset to 1!
|
|
|
-%global rustc_version 1.60.0
|
|
|
+%global rustc_version 1.61.0
|
|
|
%global cargo_version %{rustc_version}
|
|
|
%global rustfmt_version %{rustc_version}
|
|
|
%global rls_version %{rustc_version}
|
|
|
@@ -25,8 +25,8 @@
|
|
|
# To bootstrap from scratch, set the channel and date from src/stage0.txt
|
|
|
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
|
|
|
# or nightly wants some beta-YYYY-MM-DD
|
|
|
-%global bootstrap_rust 1.59.0
|
|
|
-%global bootstrap_cargo 1.59.0
|
|
|
+%global bootstrap_rust 1.60.0
|
|
|
+%global bootstrap_cargo 1.60.0
|
|
|
%global bootstrap_channel %{bootstrap_rust}
|
|
|
|
|
|
# Only the specified arches will use bootstrap binaries.
|
|
|
@@ -438,9 +438,11 @@ mkdir -p src/llvm-project/libunwind/
|
|
|
rm -rf src/llvm-emscripten/
|
|
|
|
|
|
# Remove other unused vendored libraries
|
|
|
-#rm -rf vendor/curl-sys/curl/
|
|
|
-rm -rf vendor/jemalloc-sys/jemalloc/
|
|
|
+rm -rf vendor/curl-sys/curl/
|
|
|
+rm -rf vendor/*jemalloc-sys*/jemalloc/
|
|
|
+rm -rf vendor/libmimalloc-sys/c_src/mimalloc/
|
|
|
rm -rf vendor/libz-sys/src/zlib/
|
|
|
+rm -rf vendor/libz-sys/src/zlib-ng/
|
|
|
rm -rf vendor/lzma-sys/xz-*/
|
|
|
rm -rf vendor/openssl-src/openssl/
|
|
|
%if %{without bundled_libgit2}
|
|
|
@@ -530,18 +532,21 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
|
|
|
--libdir=%{common_libdir} \
|
|
|
--build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
|
|
|
--enable-local-rust --local-rust-root=%{local_rust_root} \
|
|
|
+ --set build.rustfmt=/bin/true \
|
|
|
%{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
|
|
|
%{!?llvm_has_filecheck: --disable-codegen-tests} \
|
|
|
%{!?with_llvm_static: --enable-llvm-link-shared } } \
|
|
|
+ --disable-llvm-static-stdcpp \
|
|
|
--disable-rpath \
|
|
|
%{enable_debuginfo} \
|
|
|
+ --set rust.codegen-units-std=1 \
|
|
|
--enable-extended \
|
|
|
+ --tools=analysis,cargo,clippy,rls,rustfmt,src \
|
|
|
--enable-vendor \
|
|
|
--enable-verbose-tests \
|
|
|
- --set rust.codegen-units-std=1 \
|
|
|
--release-channel=%{channel} \
|
|
|
- --set rust.deny-warnings=false \
|
|
|
- --tools=analysis,cargo,clippy,rls,rustfmt,src \
|
|
|
+ --dist-compression-formats=gz \
|
|
|
+ --release-description="Vine Linux %{version}-%{release}" \
|
|
|
%{nil}
|
|
|
|
|
|
RUST_BACKTRACE=1 %{__python3} ./x.py build -j "$ncpus" --stage 2
|
|
|
@@ -762,6 +767,9 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat May 21 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.61.0-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Fri Apr 22 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.60.0-1
|
|
|
- new upstream release.
|
|
|
|
