commit b83676d9f8b361dc172198cd7d02cb8995ee54bf Author: Danny Rawlins <monster.romster@gmail.com> Date: Tue Jun 4 00:20:39 2019 +1000 rust: 1.34.2 -> 1.35.0 diff --git a/rust/.signature b/rust/.signature index d15a669ed..88063a2ff 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XT+qaIf1tIbwMNpCfwKMUdIo7fEizy+7k+YLMGM/fak4EtKjvLpwYF8vZ+D6/9WZ/Tz93I+YjPIRSmBNSn9wwk= -SHA256 (Pkgfile) = 11a3295d7c4abca298a65388f02bcbe6ed7b7fcfa21d5be5b32f316e0e6d5c1c +RWSE3ohX2g5d/crEPZiYtxzmIBMkkHlT2y/gqEIyKiwK3KQfcC5nCr2MvV+p6rlkpAMxuA7DMouaXKYhR2S526RvMdEXx0n0mAQ= +SHA256 (Pkgfile) = a2d4aab736eee1c2aff84ef6271f365174c932a9d8b8ba35786c54bb0c1fea6c SHA256 (.footprint) = 801d9baa44397d74e3d0ed740b1397a7dfc13479198b220653da85c6f4fcd41a -SHA256 (rustc-1.34.2-src.tar.gz) = c69a4a85a1c464368597df8878cb9e1121aae93e215616d45ad7d23af3052f56 -SHA256 (rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = 661c2ba717ae1502f002b4c6e7aeb8941685c7ea8fe7ac26ed9ede26f615b7af -SHA256 (rustc-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = 54a342f718b712d8a17fd7878ebd37d22a82ebc70b59c421168cd4153fd04c2b -SHA256 (cargo-0.34.0-x86_64-unknown-linux-gnu.tar.gz) = 4795ae5ca3bb8c7c83ca338676bb02b670efa1eb474e346284b629dc872bcce8 +SHA256 (rustc-1.35.0-src.tar.gz) = 5a4d637a716bac18d085f44dd87ef48b32195f71b967d872d80280b38cff712d +SHA256 (rust-std-1.34.2-x86_64-unknown-linux-gnu.tar.gz) = 904950e877759b32afa57e024298d7ed19c72db3fb94890057a3deb070021896 +SHA256 (rustc-1.34.2-x86_64-unknown-linux-gnu.tar.gz) = 6feecd115bd2072a1109a4afbc320dd21d23a2bd1f2d99d5377757fbb9272fc8 +SHA256 (cargo-0.35.0-x86_64-unknown-linux-gnu.tar.gz) = 1dc3cb681ee275433f3cf751e5736d097b54470e9208dfea18d8ce5505935795 diff --git a/rust/Pkgfile b/rust/Pkgfile index 951b6a818..cbadd0477 100644 --- a/rust/Pkgfile +++ b/rust/Pkgfile @@ -5,11 +5,11 @@ # Optional: sccache llvm-32 name=rust -version=1.34.2 +version=1.35.0 ##cat src/stage0.txt -_date=2019-02-28 -_rustc=1.33.0 -_cargo=0.34.0 +_date=2019-05-14 +_rustc=1.34.2 +_cargo=0.35.0 ## release=1 @@ -28,9 +28,7 @@ build() { cp $PKGMK_SOURCE_DIR/rustc-$_rustc-x86_64-unknown-linux-gnu.tar.gz build/cache/$_date/ cp $PKGMK_SOURCE_DIR/cargo-$_cargo-x86_64-unknown-linux-gnu.tar.gz build/cache/$_date/ - if [ -n "$(pkginfo -i | grep '^sccache ')" ]; then - export RUSTC_WRAPPER=/usr/bin/sccache - fi + prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache cat <<- EOF > $SRC/config.toml [llvm] @@ -55,10 +53,14 @@ cat <<- EOF > $SRC/config.toml EOF # part of [build] options if [ -e '/usr/bin/rustc' ]; then + if [ -z "$(/usr/bin/ldd /usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so | egrep '.*libLLVM-.*.so => not found')" ]; then cat <<- EOF >> $SRC/config.toml - cargo = "/usr/bin/cargo" - rustc = "/usr/bin/rustc" + cargo = "/usr/bin/cargo" + rustc = "/usr/bin/rustc" EOF + else + echo 'llvm broken symlink detected, not using system rust to bootstrap' + fi fi cat <<- EOF >> $SRC/config.toml