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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1449357 by tv,
Thu Oct  3 18:03:18 2019 UTC
+revision 1449358 by akien,
Fri Oct  4 17:55:47 2019 UTC
 Line 2
  # The aim is to work with them on a rust packaging policy we could share,
  # so that we can ensure a good packaging and share the workload.
- %global _python_bytecompile_extra 0
  # Only x86_64 and i686 are Tier 1 platforms at this time.
  # https://forge.rust-lang.org/platform-support.html
-Line 15
+Line 14
  # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
  # or nightly wants some beta-YYYY-MM-DD
  # Note that cargo matches the program version here, not its crate version.
- %global bootstrap_rust 1.36.0
+ %global bootstrap_rust 1.37.0
- %global bootstrap_cargo 1.36.0
+ %global bootstrap_cargo 1.37.0
- %global bootstrap_channel 1.36.0
+ %global bootstrap_channel 1.37.0
- %global bootstrap_date 2019-07-04
+ %global bootstrap_date 2019-08-15
  # Only the specified arches will use bootstrap binaries.
  #global bootstrap_arches %%{rust_arches}
-Line 39
+Line 38
  # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
  # is insufficient.  Rust currently requires LLVM 6.0+.
- %if 0%{?mageia} || 0%{?rhel} && !0%{?epel}
+ %if 0%{?rhel} && !0%{?epel}
+ # (akien) Hacks below are needed on mga's buildsystem when we have to rebootstrap llvm.
  # Bundled LLVM has underlinking issues:
  %global _disable_ld_no_undefined 1
- # We run out of memory building LLVM
+ %ifarch %{arm} %ix86
- %ifarch %{ix86} aarch64
+ # Decrease debuginfo verbosity to reduce memory consumption during final library linking
- %global _smp_ncpus_max 4
+ %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
  %endif
  %bcond_without bundled_llvm
  %else
  %bcond_with bundled_llvm
  %endif
- %ifarch s390 s390x %{arm} %ix86
- # Decrease debuginfo verbosity to reduce memory consumption during final library linking
- %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
- %endif
  # libgit2-sys expects to use its bundled library, which is sometimes just a
  # snapshot of libgit2's master branch.  This can mean the FFI declarations
  # won't match our released libgit2.so, e.g. having changed struct fields.
-Line 75
+Line 70
  %bcond_with lldb
  %endif
+ %if 0%{?mageia}
+ # (akien) Added by tv in mga8/rust 1.37.0.
+ %global _python_bytecompile_extra 0
+ %endif
  Name:           rust
- Version:        1.37.0
+ Version:        1.38.0
- Release:        %mkrel 2
+ Release:        %mkrel 1
  Summary:        The Rust Programming Language
  %if 0%{?mageia}
  Group:          Development/Other
 Line 98 
 Source0:        https://static.rust-lang
  # We do have the necessary fix in our LLVM 7.
  Patch1:         rust-pr57840-llvm7-debuginfo-variants.patch
+ # Mask a warning-as-error when rebuilding 1.38 with 1.38
+ Patch2:         rustc-1.38.0-rebuild-bootstrap.patch
+ # Reduce the size of rust-std
+ # https://github.com/rust-lang/rust/pull/64823
+ Patch3:         0001-WIP-minimize-the-rust-std-component.patch
  # Upstream patch to fix typenum crate build on i386/i486/i586.
- Patch2:         typenum-pr115-fix-log2-rounding-error.patch
+ Patch4:         typenum-pr115-fix-log2-rounding-error.patch
  # Upstream patch to solve: "git could not determine the LLVM submodule commit hash.
  # Assuming that an LLVM build is necessary."
- Patch3:         rust-pr64156-assume-non-git-llvm-is-fresh.patch
+ Patch5:         rust-pr64156-assume-non-git-llvm-is-fresh.patch
  # Get the Rust triple for any arch.
  %{lua: function rust_triple(arch)
-Line 447 
 test -f '%{local_rust_root}/bin/rustc'
+Line 454 
 test -f '%{local_rust_root}/bin/rustc'
  %patch1 -p1 -R
  %patch2 -p1
  %patch3 -p1
+ %patch4 -p1
+ %patch5 -p1
  %if "%{python}" == "python3"
  sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
-Line 499 
 sed -i.ffi -e '$a #[link(name = "ffi")]
+Line 508 
 sed -i.ffi -e '$a #[link(name = "ffi")]
  find vendor -name .cargo-checksum.json \
    -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
+ # Sometimes Rust sources start with #![...] attributes, and "smart" editors think
+ # it's a shebang and make them executable. Then brp-mangle-shebangs gets upset...
+ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
  %build
  %if %without bundled_libgit2
  # convince libgit2-sys to use the distro libgit2
  export LIBGIT2_SYS_USE_PKG_CONFIG=1
-Line 522 
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
+Line 536 
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
  %ifarch %{arm} %{ix86} s390x
  # full debuginfo is exhausting memory; just do libstd for now
  # https://github.com/rust-lang/rust/issues/45854
- %if (0%{?mageia} && 0%{?mageia} < 27) || (0%{?rhel} && 0%{?rhel} <= 7)
+ %if (0%{?fedora} && 0%{?fedora} < 27) || (0%{?rhel} && 0%{?rhel} <= 7)
  # Older rpmbuild didn't work with partial debuginfo coverage.
  %global debug_package %{nil}
  %define enable_debuginfo --debuginfo-level=0
-Line 540 
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
+Line 554 
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
  %define codegen_units_std --set rust.codegen-units-std=1
  %endif
- %if %with bundled_llvm
- %ifnarch x86_64
- # Limit build jobs when linking llvm to avoid OOM
- %define llvm_link_jobs --set llvm.link-jobs=1
- %endif
- %endif
  %configure2_5x --disable-option-checking \
    --libdir=%{common_libdir} \
    --build=%{rust_triple} --host=%{rust_triple} --target=%{target_triple} \
-Line 555 
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
+Line 562 
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
    %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
      %{!?llvm_has_filecheck: --disable-codegen-tests} \
      %{!?with_llvm_static: --enable-llvm-link-shared } } \
-   %{?llvm_link_jobs} \
    --disable-rpath \
    %{enable_debuginfo} \
    --enable-extended \
-Line 591 
 find %{buildroot}%{_libdir} -maxdepth 1
+Line 597 
 find %{buildroot}%{_libdir} -maxdepth 1
  (cd "%{buildroot}%{rustlibdir}/%{rust_triple}/lib" &&
   find ../../../../%{_lib} -maxdepth 1 -name '*.so' |
   while read lib; do
-    # make sure they're actually identical!
+    if [ -f "${lib##*/}" ]; then
-    cmp "$lib" "${lib##*/}"
+      # make sure they're actually identical!
-    ln -v -f -s -t . "$lib"
+      cmp "$lib" "${lib##*/}"
+      ln -v -f -s -t . "$lib"
+    fi
   done)
  # Remove installer artifacts (manifests, uninstall scripts, etc.)

 Legend:



Removed from v.1449357
 


changed lines


 
Added in v.1449358
 Legend:



Removed from v.1449357
 


changed lines


 
Added in v.1449358
-Removed from v.1449357
+Added in v.1449358

	ViewVC Help
Powered by ViewVC 1.1.30