

index 70ca569feb..0e041d6f40 100644

--- a/

+++ b/ diff --git a/DEVELOPERS b/DEVELOPERSindex 70ca569feb..0e041d6f40 100644--- a/ DEVELOPERS +++ b/ DEVELOPERS

@@ -550,6 +550,7 @@ F: package/jemalloc/

F: package/meson/

F: package/ninja/

F: package/rust-bin/

+F: package/rust/

F: package/s6/

F: package/s6-dns/

F: package/s6-linux-init/



new file mode 100644

index 0000000000..d6731b6dc2

--- /dev/null

+++ b/ diff --git a/package/rust/rust.hash b/package/rust/rust.hashnew file mode 100644index 0000000000..d6731b6dc2--- /dev/null+++ b/ package/rust/rust.hash

@@ -0,0 +1,5 @@

+# From https://static.rust-lang.org/dist/rustc-1.23.0-src.tar.xz.sha256

+sha256 7196032371b50dd5582465b3bfa79ffd783b74f0711420d99b61b26c96fb3d80 rustc-1.23.0-src.tar.xz

+# Locally generated

+sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE

+sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT



new file mode 100644

index 0000000000..6d6ac4370a

--- /dev/null

+++ b/ diff --git a/package/rust/rust.mk b/package/rust/rust.mknew file mode 100644index 0000000000..6d6ac4370a--- /dev/null+++ b/ package/rust/rust.mk

@@ -0,0 +1,79 @@

+################################################################################

+#

+# rust

+#

+################################################################################

+

+RUST_VERSION = 1.23.0

+RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz

+RUST_SITE = https://static.rust-lang.org/dist

+RUST_LICENSE = Apache-2.0 or MIT

+RUST_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT

+

+HOST_RUST_PROVIDES = host-rustc

+

+HOST_RUST_DEPENDENCIES = \

+ toolchain \

+ host-rust-bin \

+ host-cargo-bin \

+ host-python \

+ $(BR2_CMAKE_HOST_DEPENDENCY)

+

+ifeq ($(BR2_PACKAGE_JEMALLOC),y)

+HOST_RUST_DEPENDENCIES += jemalloc

+HOST_RUST_JEMALLOC_ENABLED = true

+HOST_RUST_JEMALLOC_CONF = 'jemalloc = "$(STAGING_DIR)/usr/lib/libjemalloc_pic.a"'

+else

+HOST_RUST_JEMALLOC_ENABLED = false

+endif

+

+HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0)

+

+# Some vendor crates contain Cargo.toml.orig files. The associated

+# .cargo-checksum.json file will contain a checksum for Cargo.toml.orig but

+# support/scripts/apply-patches.sh will delete them. This will cause the build

+# to fail, as Cargo will not be able to find the file and verify the checksum.

+# So, remove all Cargo.toml.orig entries from the affected .cargo-checksum.json

+# files

+define HOST_RUST_EXCLUDE_ORIG_FILES

+ for file in $$(find $(@D) -name '*.orig'); do \

+ crate=$$(dirname $${file}); \

+ fn=$${crate}/.cargo-checksum.json; \

+ sed -i -e 's/"Cargo.toml.orig":"[a-z0-9]\+",//g' $${fn}; \

+ done

+endef

+

+HOST_RUST_POST_EXTRACT_HOOKS += HOST_RUST_EXCLUDE_ORIG_FILES

+

+define HOST_RUST_CONFIGURE_CMDS

+ ( \

+ echo '[build]'; \

+ echo 'target = ["$(RUST_TARGET_NAME)"]'; \

+ echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \

+ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \

+ echo 'python = "$(HOST_DIR)/bin/python2"'; \

+ echo 'submodules = false'; \

+ echo 'vendor = true'; \

+ echo 'compiler-docs = false'; \

+ echo 'docs = false'; \

+ echo 'verbose = $(HOST_RUST_VERBOSITY)'; \

+ echo '[install]'; \

+ echo 'prefix = "$(HOST_DIR)"'; \

+ echo '[rust]'; \

+ echo 'use-jemalloc = $(HOST_RUST_JEMALLOC_ENABLED)'; \

+ echo '[target.$(RUST_TARGET_NAME)]'; \

+ echo 'cc = "$(TARGET_CROSS)gcc"'; \

+ echo $(HOST_RUST_JEMALLOC_CONF); \

+ ) > $(@D)/config.toml

+endef

+

+define HOST_RUST_BUILD_CMDS

+ cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py build

+endef

+

+define HOST_RUST_INSTALL_CMDS

+ cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py dist

+ cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py install

+endef

+

+$(eval $(host-generic-package))

@@ -40,6 +40,24 @@ choice

help

Select a Rust compiler

+config BR2_PACKAGE_HOST_RUST

+ bool "host rust"

+ depends on BR2_HOST_GCC_AT_LEAST_4_7 # required by LLVM

+ # triggers ICE on trunc_int_for_mode, at explow.c:56

+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_aarch64

+ select BR2_PACKAGE_HAS_HOST_RUSTC

+ help

+ This package will build the compiler for the host as well as

+ two flavors of the standard library: one for the host, another

+ for the target. Both are installed in the host directory.

+

+comment "host-rust needs a toolchain w/ gcc >= 5"

+ depends on BR2_aarch64

+ depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5

+

+comment "host-rust needs host gcc >= 4.7"

+ depends on !BR2_HOST_GCC_AT_LEAST_4_7

+

config BR2_PACKAGE_HOST_RUST_BIN

bool "host rust (pre-built)"

select BR2_PACKAGE_HAS_HOST_RUSTC

@@ -54,6 +72,7 @@ config BR2_PACKAGE_HAS_HOST_RUSTC

config BR2_PACKAGE_PROVIDES_HOST_RUSTC

string

+ default "host-rust" if BR2_PACKAGE_HOST_RUST

default "host-rust-bin" if BR2_PACKAGE_HOST_RUST_BIN

endif