rust: update to 1.68.1
authorOskari Rauta <oskari.rauta@gmail.com>
Tue, 28 Mar 2023 18:46:20 +0000 (21:46 +0300)
committerTianling Shen <cnsztl@gmail.com>
Thu, 30 Mar 2023 19:35:41 +0000 (03:35 +0800)
also add new variable CARGO_VARS to make it possible
to pass environment variables for cargo process.
This is necessary when for example, cross-compiling
netavark.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
lang/rust/Makefile
lang/rust/rust-package.mk
lang/rust/rust-values.mk

index ca5437aeb6a1b48841ff25003934d6a4d0736cd1..dcee587ac522ef48651d4ad53d81da4e720ebecd 100644 (file)
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rust
-PKG_VERSION:=1.68.0
+PKG_VERSION:=1.68.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
-PKG_HASH:=eaf4d8b19f23a232a4770fb53ab5e7acdedec11da1d02b0e5d491ca92ca96d62
+PKG_HASH:=ccb051df5701d4c588e3d0558f83e73e7eea0a9b165dab3e39dd2db8a6a25d03
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/rustc-$(PKG_VERSION)-src
 
 PKG_MAINTAINER:=Luca Barbato <lu_zero@luminem.org>
index 4e39009cc03638db63995e44b4cf67a6f9fb29c9..6ab0e239922efdf985e9fdd3267f8158f6d85cb5 100644 (file)
@@ -27,7 +27,8 @@ define Build/Compile/Cargo
                CARGO_HOME=$(CARGO_HOME) \
                TARGET_CFLAGS="$(TARGET_CFLAGS) $(RUST_CFLAGS)" \
                TARGET_CC=$(TARGET_CC_NOCACHE) \
-               CC=$(HOSTCC) \
+               CC=$(HOSTCC_NOCACHE) \
+               $(CARGO_VARS) \
                cargo install -v \
                        --profile stripped \
                        --target $(RUSTC_TARGET_ARCH) \
index c9eb26f08054297e9cae59c07245151b827a3871..daebec2d6950161ab7c307e0396de973c53a1650 100644 (file)
@@ -6,6 +6,7 @@
 CONFIG_HOST_SUFFIX:=$(word 4, $(subst -, ,$(GNU_HOST_NAME)))
 RUSTC_HOST_ARCH:=$(HOST_ARCH)-unknown-linux-$(CONFIG_HOST_SUFFIX)
 CARGO_HOME:=$(STAGING_DIR_HOSTPKG)/cargo
+CARGO_VARS:=
 
 ifeq ($(CONFIG_USE_MUSL),y)
 # Force linking of the SSP library for musl