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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1848765 by akien,
Mon Apr 11 10:12:25 2022 UTC
+revision 1848766 by akien,
Mon Apr 11 10:27:36 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
- # Note that cargo matches the program version here, not its crate version.
+ %global bootstrap_version 1.59.0
- %global bootstrap_version 1.58.0
+ %global bootstrap_channel 1.59.0
- %global bootstrap_channel 1.58.0
+ %global bootstrap_date 2022-02-24
- %global bootstrap_date 2022-01-13
  # Only the specified arches will use bootstrap binaries.
  # NOTE: Those binaries used to be uploaded with every new release, but that was
  # a waste of lookaside cache space when they're most often unused.
  # Run "spectool -g rust.spec" after changing this and then "fedpkg upload" to
  # add them to sources. Remember to remove them again after the bootstrap build!
  #global bootstrap_arches %%{rust_arches}
  # To bootstrap a compiler for a Tier 2 platform, we first need to build a
-Line 62
+Line 61
  # 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 13.0.0
+ %global bundled_llvm_version 14.0.0
  %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 73
+Line 72
  #%%endif
  # Requires stable libgit2 1.3, and not the next minor soname change.
+ # This needs to be consistent with the bindings in vendor/libgit2-sys.
  %global min_libgit2_version 1.3.0
  %global next_libgit2_version 1.4.0~
  %global bundled_libgit2_version 1.3.0
 Line 110
  %endif
  Name:           rust
- Version:        1.59.0
+ Version:        1.60.0
- Release:        %mkrel 3
+ Release:        %mkrel 1
  Summary:        The Rust Programming Language
  %if 0%{?mageia}
  Group:          Development/Other
 Line 135 
 Patch1:         0001-Use-lld-provided-by
  # This regressed in 1.59, hanging builds on s390x, rhbz#2058803
  # https://github.com/rust-lang/rust/pull/94505
  Patch2:         rust-pr94505-mono-item-sort-local.patch
+ # Clang 14 adds new builtin macros that wasi-libc doesn't expect yet
+ # See https://github.com/WebAssembly/wasi-libc/pull/265
+ Patch3:         wasi-libc-clang-14-compat.patch
  # (akien) Those tests fail on armv7 - on Fedora too, and jistone ignores them
  # https://github.com/rust-lang/rust/issues/83453
-Line 148 
 Patch100:       rustc-1.59.0-disable-lib
+Line 152 
 Patch100:       rustc-1.59.0-disable-lib
  # libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
  # will try to build it statically -- instead we turn off the feature.
- Patch101:       rustc-1.59.0-disable-http2.patch
+ Patch101:       rustc-1.60.0-disable-http2.patch
  # kernel rh1410097 causes too-small stacks for PIE.
  # (affects RHEL6 kernels when building for RHEL7)
-Line 340 
 BuildRequires:  %{devtoolset_name}-gcc-c
+Line 344 
 BuildRequires:  %{devtoolset_name}-gcc-c
  BuildRequires:  mingw32-filesystem >= 95
  BuildRequires:  mingw64-filesystem >= 95
  BuildRequires:  mingw32-crt
  BuildRequires:  mingw64-crt
  BuildRequires:  mingw32-gcc
  BuildRequires:  mingw64-gcc
  BuildRequires:  mingw32-winpthreads-static
  BuildRequires:  mingw64-winpthreads-static
  %endif
  %if %defined wasm_targets
-Line 594 
 test -f '%{local_rust_root}/bin/rustc'
+Line 598 
 test -f '%{local_rust_root}/bin/rustc'
  %if %defined wasm_targets
  %setup -q -n %{wasi_libc_name} -T -b 1
+ %patch3 -p1
  %endif
  %setup -q -n %{rustc_package}
-Line 704 
 if [ "$max_cpus" -ge 1 -a "$max_cpus" -l
+Line 709 
 if [ "$max_cpus" -ge 1 -a "$max_cpus" -l
    ncpus="$max_cpus"
  fi
- %define target_config %{shrink:
-   --set target.%{rust_triple}.linker=%{__cc}
-   --set target.%{rust_triple}.cc=%{__cc}
-   --set target.%{rust_triple}.cxx=%{__cxx}
-   --set target.%{rust_triple}.ar=%{__ar}
-   --set target.%{rust_triple}.ranlib=%{__ranlib}
- }
  %if %defined mingw_targets
  %{lua: do
    local cfg = ""
-Line 720 
 fi
+Line 717 
 fi
        triple = triple,
        mingw = string.find(rpm.expand("%{ix86}"), string.sub(triple, 1, 4)) and "mingw32" or "mingw64",
      }
-     local s = string.gsub([[%{shrink:
+     local s = string.gsub([[
        --set target.{{triple}}.linker=%{{{mingw}}_cc}
        --set target.{{triple}}.cc=%{{{mingw}}_cc}
        --set target.{{triple}}.ar=%{{{mingw}}_ar}
        --set target.{{triple}}.ranlib=%{{{mingw}}_ranlib}
-     }]], "{{(%w+)}}", subs)
+     ]], "{{(%w+)}}", subs)
      cfg = cfg .. " " .. s
    end
+   cfg = string.gsub(cfg, "%s+", " ")
    rpm.define("mingw_target_config " .. cfg)
  end}
  %endif
-Line 749 
 end}
+Line 747 
 end}
  %configure --disable-option-checking \
    --libdir=%{common_libdir} \
    --build=%{rust_triple} --host=%{rust_triple} --target=%{target_triple} \
-   %{target_config} \
+   --set target.%{target_triple}.linker=%{__cc} \
+   --set target.%{target_triple}.cc=%{__cc} \
+   --set target.%{target_triple}.cxx=%{__cxx} \
+   --set target.%{target_triple}.ar=%{__ar} \
+   --set target.%{target_triple}.ranlib=%{__ranlib} \
    %{?mingw_target_config} \
    %{?wasm_target_config} \
    --python=%{__python3} \
    --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 } } \
-Line 868 
 for triple in %{?mingw_targets} %{?wasm_
+Line 871 
 for triple in %{?mingw_targets} %{?wasm_
    env RUSTC=%{buildroot}%{_bindir}/rustc \
        LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" \
        %{buildroot}%{_bindir}/cargo build --manifest-path build/hello-world/Cargo.toml --target=$triple
  done
  # The results are not stable on koji, so mask errors and just log it.
  # Some of the larger test artifacts are manually cleaned to save space.

 Legend:



Removed from v.1848765
 


changed lines


 
Added in v.1848766
 Legend:



Removed from v.1848765
 


changed lines


 
Added in v.1848766
-Removed from v.1848765
+Added in v.1848766

	ViewVC Help
Powered by ViewVC 1.1.30