/[packages]/cauldron/rust/current/SPECS/rust.spec

Diff of /cauldron/rust/current/SPECS/rust.spec

Parent Directory | Revision Log | View Patch Patch

-revision 1891434 by tv,
Thu Sep 22 09:18:09 2022 UTC
+revision 1891744 by akien,
Fri Sep 23 08:39:59 2022 UTC
 Line 13
  # To bootstrap from scratch, set the channel and date from src/stage0.json
  # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
  # or nightly wants some beta-YYYY-MM-DD
- %global bootstrap_version 1.62.0
+ %global bootstrap_version 1.63.0
- %global bootstrap_channel 1.62.0
+ %global bootstrap_channel 1.63.0
- %global bootstrap_date 2022-06-30
+ %global bootstrap_date 2022-08-11
  # Only the specified arches will use bootstrap binaries.
  # NOTE: Those binaries used to be uploaded with every new release, but that was
 Line 62
  # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
  # is insufficient.  Rust currently requires LLVM 12.0+.
  %global min_llvm_version 12.0.0
- %global bundled_llvm_version 14.0.5
+ %global bundled_llvm_version 14.0.6
  %bcond_with bundled_llvm
  # (akien) Hacks below are needed on mga's buildsystem when we have to rebootstrap llvm.
  ## Bundled LLVM has underlinking issues:
 Line 111
  %endif
  Name:           rust
- Version:        1.63.0
+ Version:        1.64.0
- Release:        %mkrel 3
+ Release:        %mkrel 1
  Summary:        The Rust Programming Language
  %if 0%{?mageia}
  Group:          Development/Other
 Line 155 
 Patch101:       rustc-1.63.0-disable-htt
  # kernel rh1410097 causes too-small stacks for PIE.
  # (affects RHEL6 kernels when building for RHEL7)
- Patch102:       rustc-1.58.0-no-default-pie.patch
+ Patch102:       rustc-1.64.0-no-default-pie.patch
  # Get the Rust triple for any arch.
 Line 540 
 A tool for formatting Rust code accordin
  %package -n rls
- Summary:        Rust Language Server for IDE integration
+ Summary:        Rust Language Server for IDE integration (deprecated)
  %if %with bundled_libgit2
  Provides:       bundled(libgit2) = %{bundled_libgit2_version}
  %endif
 Line 555 
 Provides:       rls-preview = %{version}
  %description -n rls
  The Rust Language Server provides a server that runs in the background,
  providing IDEs, editors, and other tools with information about Rust programs.
- It supports functionality such as 'goto definition', symbol search,
+ RLS is being deprecated in favor of rust-analyzer, and may be removed in the future.
- reformatting, and code completion, and enables renaming and refactorings.
+ https://blog.rust-lang.org/2022/07/01/RLS-deprecation.html
+ %package analyzer
+ Summary:        Rust implementation of the Language Server Protocol
+ %description analyzer
+ rust-analyzer is an implementation of Language Server Protocol for the Rust
+ programming language. It provides features like completion and goto definition
+ for many code editors, including VS Code, Emacs and Vim.
  %package -n clippy
-Line 628 
 test -f '%{local_rust_root}/bin/rustc'
+Line 637 
 test -f '%{local_rust_root}/bin/rustc'
  %patch1 -p1
  %patch2 -p1
+ %patch3 -p1
  %patch11 -p1
-Line 792 
 end}
+Line 802 
 end}
    %{enable_debuginfo} \
    --set rust.codegen-units-std=1 \
    --enable-extended \
-   --tools=analysis,cargo,clippy,rls,rustfmt,src \
+   --tools=analysis,cargo,clippy,rls,rust-analyzer,rustfmt,src \
    --enable-vendor \
    --enable-verbose-tests \
    --dist-compression-formats=gz \
-Line 832 
 find %{buildroot}%{_libdir} -maxdepth 1
+Line 842 
 find %{buildroot}%{_libdir} -maxdepth 1
  # The libdir libraries are identical to those under rustlib/.  It's easier on
  # library loading if we keep them in libdir, but we do need them in rustlib/
  # to support dynamic linking for compiler plugins, so we'll symlink.
- (cd "%{buildroot}%{rustlibdir}/%{rust_triple}/lib" &&
+ find %{buildroot}%{rustlibdir}/%{rust_triple}/lib/ -maxdepth 1 -type f -name '*.so' |
-  find ../../../../%{_lib} -maxdepth 1 -name '*.so' |
+ while read lib; do
-  while read lib; do
+  lib2="%{buildroot}%{_libdir}/${lib##*/}"
-    if [ -f "${lib##*/}" ]; then
+  if [ -f "$lib2" ]; then
-      # make sure they're actually identical!
+    # make sure they're actually identical!
-      cmp "$lib" "${lib##*/}"
+    cmp "$lib" "$lib2"
-      ln -v -f -s -t . "$lib"
+    ln -v -f -r -s -T "$lib2" "$lib"
-    fi
+  fi
-  done)
+ done
  # Remove installer artifacts (manifests, uninstall scripts, etc.)
  find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+'
-Line 919 
 rm -rf "./build/%{rust_triple}/stage2-to
+Line 929 
 rm -rf "./build/%{rust_triple}/stage2-to
  env RLS_TEST_WAIT_FOR_AGES=1 \
  %{__python3} ./x.py test --no-fail-fast --stage 2 rls || :
+ %{__python3} ./x.py test --no-fail-fast --stage 2 rust-analyzer || :
  %{__python3} ./x.py test --no-fail-fast --stage 2 rustfmt || :
-Line 931 
 env RLS_TEST_WAIT_FOR_AGES=1 \
+Line 943 
 env RLS_TEST_WAIT_FOR_AGES=1 \
  %{_bindir}/rustc
  %{_bindir}/rustdoc
  %{_libdir}/*.so
+ %{_libexecdir}/rust-analyzer-proc-macro-srv
  %{_mandir}/man1/rustc.1*
  %{_mandir}/man1/rustdoc.1*
  %dir %{rustlibdir}
-Line 1075 
 end}
+Line 1088 
 end}
  %license src/tools/rls/LICENSE-{APACHE,MIT}
+ %files analyzer
+ %{_bindir}/rust-analyzer
+ %doc src/tools/rust-analyzer/README.md
+ %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT}
  %files -n clippy
  %{_bindir}/cargo-clippy
  %{_bindir}/clippy-driver

 Legend:



Removed from v.1891434
 


changed lines


 
Added in v.1891744
 Legend:



Removed from v.1891434
 


changed lines


 
Added in v.1891744
-Removed from v.1891434
+Added in v.1891744

	ViewVC Help
Powered by ViewVC 1.1.30