rust: Update to 1.65

[people/pmueller/ipfire-2.x.git] / lfs / rust

diff --git a/lfs/rust b/lfs/rust
index 7ff84379ba009f62cc4fc0698b076147e7156b83..f1464820892e8d46f02fa508520c5dafe2b090bf 100644 (file)
--- a/lfs/rust
+++ b/lfs/rust
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,22 +24,15 @@
 
 include Config
 
-VER        = 1.51.0
+VER        = 1.65.0
+
+# From https://forge.rust-lang.org/infra/other-installation-methods.html#standalone-installers
 
 THISAPP    = rust-$(VER)
-DL_FILE    = $(THISAPP)-$(RUST_BOOTSTRAP).tar.gz
+DL_FILE    = $(THISAPP)-$(RUST_PLATFORM).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)-$(RUST_BOOTSTRAP)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)-$(RUST_PLATFORM)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = x86_64 aarch64 armv6l
-
-RUST_ARCH  = $(BUILD_ARCH)
-
-ifeq "$(BUILD_ARCH)" "armv6l"
-       RUST_BOOTSTRAP = arm-unknown-linux-gnueabi
-else
-       RUST_BOOTSTRAP = $(RUST_ARCH)-unknown-linux-gnu
-endif
 
 ###############################################################################
 # Top-level Rules
@@ -49,9 +42,10 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_MD5 =  efc4d147e25918e60678a69fcaf67b55
-$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_MD5 = e85e1758b9770bae16c253825e2ecf9c
-$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_MD5 = da4fa1b2bd21dc6d2d7e791d8faaa3eb
+$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = db2dd8518571c5d054502820a0f49483a6cf743ac74747cdb6bb2f3d681b2132de0ed2eb2a5228eaaf7fe737e415cb477764d04d29f565e2bf6cecf6109a468b
+$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 73c0c4d995cf6e81b584b078528035d1fedb12e3c0d0435025945e2ba396850676f7f581ad1e627769122bbba5424591fac734520186b704bff7f7a8ca241385
+$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = 9038b158b2590a8a0a25f72f17ff38d88aff1cb210818a150f24d34dbdff9195f156f21ddccaadf9a3ecd3901161e183b5cb0e15e012f4a26be937a9782e0c6c
+$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = 76874cfd1e8235eb6d99f75bd9affafa50d1b824664b2edd35c1a5276f51eabaf3f5d5c408070580bbfbdab862e6fe4186f552427e72ac3afa245b2c41c275ae
 
 install : $(TARGET)
 
@@ -59,10 +53,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -71,8 +65,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -83,12 +77,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && ./install.sh \
-               --components=cargo,rustc,rust-std-$(RUST_BOOTSTRAP) \
+               --components=cargo,rustc,rust-std-$(RUST_PLATFORM) \
                --prefix=/usr \
                --disable-ldconfig
 
        # Remove LLVM tools
-       rm -vf /usr/lib/rustlib/$(RUST_BOOTSTRAP)/bin/rust-ll{d,vm-dwp}
+       rm -vf /usr/lib/rustlib/$(RUST_PLATFORM)/bin/rust-ll{d,vm-dwp}
+
+       # Create local registry
+       mkdir -pv $(CARGO_REGISTRY)
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)