Add support for the Rust programming

package/rustc/Config.in.host new file +0 -0

new file mode 100644
index 0000000000..16c95fa0b4

package/rustc/rustc.mk new file +9 -0

new file mode 100644
index 0000000000..4163a44bc1
@@ -0,0 +1,31 @@
+################################################################################
+#
+# rustc
+#
+################################################################################
+
+RUST_ARCH := $(call qstrip,$(BR2_ARCH))
+
+ifeq ($(BR2_ARM_CPU_ARMV7A),y)

Hello,

Quoted 6 lines · Eric Le Bihan

package/rustc/Config.in.host new file +0 -0

new file mode 100644
index 0000000000..16c95fa0b4

package/rustc/Config.in.host line 8

Quoted 8 lines

package/rustc/Config.in.host new file +8 -0

@@ -0,0 +1,17 @@
+config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+	bool
+	default y
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_i386 || BR2_x86_64 \
+		|| BR2_arm  || BR2_aarch64 \
+		|| BR2_powerpc  || BR2_powerpc64 \
+		|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el

This would be more readable as:

	default y if BR2_aarch64
	default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5
	default y if BR2_i386
	default y if ...
	default y if BR2_mips || BR2_mipsel
	default y if (BR2_mips64 || BR2_mips64el) && BR2_MIPS_NABI64
	default y if BR2_x86_64

package/rustc/Config.in.host line 11

Quoted 3 lines

package/rustc/Config.in.host new file +3 -0

+	depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5
+	depends on !BR2_MIPS_NABI32
+	depends on BR2_TOOLCHAIN_USES_GLIBC

Since it's weird for a host package to have a target architecture dependency and target C library dependency, it would be good to have a comment that explains this. I assume it's because of the Rust standard library, so something like:

# The pre-built Rust standard library is only available for the # following architectures/ABIs, and is built against glibc.

Quoted 15 lines

package/rustc/rustc.mk new file +9 -0

new file mode 100644
index 0000000000..4163a44bc1
@@ -0,0 +1,31 @@
+################################################################################
+#
+# rustc
+#
+################################################################################
+
+RUST_ARCH := $(call qstrip,$(BR2_ARCH))
+
+ifeq ($(BR2_ARM_CPU_ARMV7A),y)

package/rustc/rustc.mk line 19

Quoted 10 lines

package/rustc/rustc.mk new file +10 -0

+RUST_ARCH := armv7
+endif
+
+ifeq ($(BR2_ARM_EABI),y)
+RUST_ABI := eabi
+else ifeq ($(BR2_ARM_EABIHF),y)
+RUST_ABI := eabihf
+else ifeq ($(BR2_mips64)$(BR2_mips64el),y)
+RUST_ABI := abi64
+endif

Perhaps this could be defined in the Config.in file as well ?

config BR2_PACKAGE_HOST_RUSTC_ARCH
string
default "armv7" if BR2_ARM_CPU_ARMV7A
default BR2_ARCH if !BR2_ARM_CPU_ARMV7A

config BR2_PACKAGE_HOST_RUSTC_ABI
string
default "eabi" if BR2_ARM_EABI
default "eabihf" if BR2_ARM_EABIHF
default "abi64" if BR2_MIPS_NABI64

package/rustc/rustc.mk line 21

Quoted 1 line

package/rustc/rustc.mk new file +1 -0

+RUST_TARGET_NAME := $(RUST_ARCH)-unknown-linux-gnu$(RUST_ABI)

Why are you using := in this file instead of = ?

This package provides a pre-built version of rustc, the compiler for the Rust programming language, fetched from the upstream project.

A pre-built version of the standard library for the host as well as one for the chosen target are also fetched and installed.

package/rust-bin/rust-bin.mk new file +9 -0

new file mode 100644
index 0000000000..29f94b7f2d
@@ -0,0 +1,63 @@
+################################################################################
+#
+# rust-bin
+#
+################################################################################
+
+RUST_BIN_VERSION = 1.22.1
+RUST_BIN_SITE = https://static.rust-lang.org/dist
+RUST_BIN_LICENSE = Apache-2.0 or MIT

Hello,

Quoted 5 lines · Eric Le Bihan

This package provides a pre-built version of rustc, the compiler for the Rust programming language, fetched from the upstream project.

A pre-built version of the standard library for the host as well as one for the chosen target are also fetched and installed.

I was wondering if a separate package could be used to install the standard library, in order to avoid the extra downloads and custom extract step.

One possibility would be to have a rust-std-bin package, which rust-bin depends on. The target version of rust-std-bin would install the target libraries, while the host version would install the host libraries. The weird thing is that the target libraries are installed in $(HOST_DIR), while one would expect them to be in $(STAGING_DIR). Is this something we can tell rustc about perhaps ?

Even if we keep the single package approach, having the target libraries in $(STAGING_DIR) would be more logical. But that's a soft requirement, so if it's too tedious to achieve with rustc, we can live with them being in HOST_DIR.

Quoted 21 lines

package/rust-bin/rust-bin.mk new file +15 -0

new file mode 100644
index 0000000000..29f94b7f2d
@@ -0,0 +1,63 @@
+################################################################################
+#
+# rust-bin
+#
+################################################################################
+
+RUST_BIN_VERSION = 1.22.1
+RUST_BIN_SITE = https://static.rust-lang.org/dist
+RUST_BIN_LICENSE = Apache-2.0 or MIT
+RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
+
+HOST_RUST_BIN_PROVIDES = host-rustc
+
+HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUST_HOST_NAME).tar.xz
+HOST_RUST_BIN_LIBSTD_SOURCES = \

package/rust-bin/rust-bin.mk line 19

Quoted 4 lines

package/rust-bin/rust-bin.mk new file +4 -0

+	rust-std-$(RUST_BIN_VERSION)-$(RUST_HOST_NAME).tar.xz \
+	rust-std-$(RUST_BIN_VERSION)-$(RUST_TARGET_NAME).tar.xz
+
+HOST_RUST_BIN_EXTRA_DOWNLOADS = $(HOST_RUST_BIN_LIBSTD_SOURCES)

Assuming we keep the single package approach, then why not use HOST_RUST_BIN_EXTRA_DOWNLOADS directly ? HOST_RUST_BIN_LIBSTD_SOURCES looks a bit useless.

package/rust-bin/rust-bin.mk line 26

Quoted 6 lines

package/rust-bin/rust-bin.mk new file +6 -0

+HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUST_HOST_NAME)/rust-std-$(RUST_HOST_NAME)
+
+define HOST_RUST_BIN_LIBSTD_EXTRACT
+	mkdir -p $(@D)/std
+	for file in $(addprefix $(DL_DIR)/,$(HOST_RUST_BIN_LIBSTD_SOURCES)); do \
+		$(TAR) -C $(@D)/std -xJf $${file}; \

This would benefit from using $(foreach ...) and should use suitable-extractor. Something like (untested):

	$(foreach f,$(HOST_RUST_BIN_EXTRA_DOWNLOADS), \
		$(call suitable-extractor,$(f)) $(DL_DIR)/$(f) | \
			$(TAR) -C $(@D)/std $(TAR_OPTIONS) -
	)

package/rust-bin/rust-bin.mk line 31

Quoted 5 lines

package/rust-bin/rust-bin.mk new file +5 -0

+	done
+	(\
+		cd $(@D)/rustc/lib/rustlib; \
+		ln -sf ../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUST_HOST_NAME) \
+	)

There's no need for this command to run in a sub-shell, so:

	cd $(@D)/rustc/lib/rustlib; \
		ln -sf ../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUST_HOST_NAME)

should be sufficient.

package/rust-bin/rust-bin.mk line 40

Quoted 9 lines

package/rust-bin/rust-bin.mk new file +9 -0

+endef
+
+HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT
+
+HOST_RUST_BIN_INSTALL_OPTS = \
+	--prefix=$(HOST_DIR) \
+	--disable-ldconfig
+
+ifeq ($(BR2_PACKAGE_HOST_RUST_BIN),y)

Why do you have this conditional ? If the package isn't built, then those definitions aren't used anyway.

The rest looks good to me. Thanks!

This new package fetches a binary version of Cargo, suitable to bootstrap the host variants of the Rust compiler and Cargo, the package manager.

Signed-off-by Eric Le Bihan <[email protected]>

package/cargo-bin/cargo-bin.mk new file +2 -0

new file mode 100644
index 0000000000..e0f6381070
@@ -0,0 +1,14 @@
+################################################################################
+#

Hello,

Quoted 5 lines · Eric Le Bihan

This new package fetches a binary version of Cargo, suitable to bootstrap the host variants of the Rust compiler and Cargo, the package manager.

Signed-off-by Eric Le Bihan <[email protected]>

Looks good, just one comment below.

Quoted 12 lines

package/cargo-bin/cargo-bin.mk new file +6 -0

new file mode 100644
index 0000000000..e0f6381070
@@ -0,0 +1,14 @@
+################################################################################
+#
+# cargo-bin
+#
+################################################################################
+

package/cargo-bin/cargo-bin.mk line 12

Quoted 6 lines

package/cargo-bin/cargo-bin.mk new file +6 -0

+CARGO_BIN_VERSION = 0.23.0
+CARGO_BIN_SITE = https://static.rust-lang.org/dist
+CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUST_HOST_NAME).tar.xz
+CARGO_BIN_LICENSE = Apache-2.0 or MIT
+CARGO_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
+CARGO_BIN_STRIP_COMPONENTS = 1

This is the default, so why do you need this ?

This new package provides rustc, the compiler for the Rust programming language, built from source.

Currently, only the host variant is built.

The Rust compiler uses LLVM as its backend: a copy of LLVM source code is provided and CMake is used to build it. It is possible to use a pre-built external copy. When LLVM/clang will be available in Buildroot, it would be possible to benefit from this feature and thus decrease build time.

LLVM is configured to generate code for x86, ARM, PowerPC and MIPS architectures.

The Rust compiler uses Cargo as its build system and is written in Rust. Therefore this package depends on cargo-bin and rust-bin.

The internal build process is as follows:

1. rustc-stage0, provided by rust-bin, is used to build rustc-stage1.
2. rust-stage1 builds the final Rust compiler (rust-stage2) and the standard library for the host architecture.

package/rust/rust.mk new file +6 -0

new file mode 100644
index 0000000000..8dbec99bc5
@@ -0,0 +1,82 @@
+################################################################################
+#
+# rust
+#
+################################################################################
+

package/rust/rust.mk new file +50 -0

+# .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 $(HOST_RUST_BUILD_OPTS))
+endef
+
+define HOST_RUST_INSTALL_CMDS
+	(cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py \
+		dist $(HOST_RUST_BUILD_OPTS))
+	(cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py \
+		install $(HOST_RUST_BUILD_OPTS))
+endef
+
+$(eval $(host-generic-package))

package/rustc/Config.in.host +4 -0

index e42187d477..3a03140bcd 100644
@@ -26,6 +26,21 @@ 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

Hello,

Quoted 17 lines · Eric Le Bihan

This new package provides rustc, the compiler for the Rust programming language, built from source.

Currently, only the host variant is built.

The Rust compiler uses LLVM as its backend: a copy of LLVM source code is provided and CMake is used to build it. It is possible to use a pre-built external copy. When LLVM/clang will be available in Buildroot, it would be possible to benefit from this feature and thus decrease build time.

LLVM is configured to generate code for x86, ARM, PowerPC and MIPS architectures.

The Rust compiler uses Cargo as its build system and is written in Rust. Therefore this package depends on cargo-bin and rust-bin.

Quoted 5 lines

The internal build process is as follows:

1. rustc-stage0, provided by rust-bin, is used to build rustc-stage1.
2. rust-stage1 builds the final Rust compiler (rust-stage2) and the standard library for the host architecture.

You're sometimes using rustc-stageX, sometimes just rust-stageX. Is this intentional ?

Quoted 12 lines

package/rust/rust.mk new file +6 -0

new file mode 100644
index 0000000000..8dbec99bc5
@@ -0,0 +1,82 @@
+################################################################################
+#
+# rust
+#
+################################################################################
+

package/rust/rust.mk line 16

Quoted 10 lines

package/rust/rust.mk new file +10 -0

+RUST_VERSION = 1.22.1
+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 \

It is somewhat unusual to have a host package depend on the target toolchain. I'm not sure we have any other host package in the tree doing this. I do understand why you're doing this, I'm just a little bit concerned that this special situation may be forgotten in the future. But there isn't much other solution, so it's probably good as it is.

package/rust/rust.mk line 19

Quoted 3 lines

package/rust/rust.mk new file +3 -0

+	host-rust-bin \
+	host-cargo-bin \
+	host-python \

So you absolutely need python2 ? The build system is not python3 compliant ?

package/rust/rust.mk line 20

Quoted 1 line

package/rust/rust.mk new file +1 -0

+	host-cmake

Could you use $(BR2_CMAKE_HOST_DEPENDENCY) instead ? This way, it would only build host-cmake if CMake is not already present on the system. This would save a bit of build time.

Quoted 5 lines

package/rust/rust.mk new file +5 -0

+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

package/rust/rust.mk line 32

Quoted 6 lines

package/rust/rust.mk new file +6 -0

+HOST_RUST_JEMALLOC_ENABLED = false
+endif
+
+HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0)
+
+# Some vendored crates contain Cargo.toml.orig files. The associated

vendored -> vendor ?

Quoted 58 lines

package/rust/rust.mk new file +50 -0

+# .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 $(HOST_RUST_BUILD_OPTS))
+endef
+
+define HOST_RUST_INSTALL_CMDS
+	(cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py \
+		dist $(HOST_RUST_BUILD_OPTS))
+	(cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py \
+		install $(HOST_RUST_BUILD_OPTS))
+endef
+
+$(eval $(host-generic-package))

package/rustc/Config.in.host +0 -0

index e42187d477..3a03140bcd 100644
@@ -26,6 +26,21 @@ choice
 	help
 	  Select a Rust compiler
 

Quoted 4 lines

package/rustc/Config.in.host +4 -0

+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

package/rustc/Config.in.host choice · line 42

Quoted 10 lines

package/rustc/Config.in.host +10 -0

+	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

What about the gcc 4.7 dependency? It would also need a comment.

Allow build of host variant of libssh2, which depends on host-openssl.

Signed-off-by Eric Le Bihan <[email protected]>

Allow build of host variant of libhttpparser.

Signed-off-by Eric Le Bihan <[email protected]>

Signed-off-by Eric Le Bihan <[email protected]>

This new package provides Cargo, the Rust official package manager. Cargo is written in Rust and uses Cargo as its build system. It also depends on other Rust packages.

Normally, a previously installed version of Cargo would be used to:

1. Fetch the dependencies.
2. Build the new version of Cargo, using the available Rust compiler.

But the fetching step prevents offline builds. So instead two features of Cargo are levelled: vendoring [1] and local registry.

package/cargo/Config.in.host new file +0 -0

new file mode 100644
index 0000000000..0f1ca305c6

package/cargo/cargo.hash new file +34 -0

+	host-pkgconf \
+	host-openssl \
+	host-libhttpparser \
+	host-libssh2 \
+	host-libcurl \
+	host-rustc \
+	host-cargo-bin
+
+HOST_CARGO_SNAP_BIN = $(HOST_CARGO_BIN_DIR)/cargo/bin/cargo
+HOST_CARGO_HOME = $(HOST_DIR)/share/cargo
+
+define HOST_CARGO_EXTRACT_DEPS
+	@mkdir -p $(@D)/vendor
+	$(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \
+		$(DL_DIR)/$(CARGO_DEPS_SOURCE) | \
+		$(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) -
+endef
+
+HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS
+
+define HOST_CARGO_EXTRACT_INSTALLER
+	@mkdir -p $(@D)/src/rust-installer
+	$(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \
+		$(DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \
+		$(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) -
+endef
+
+HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER
+
+define HOST_CARGO_SETUP_DEPS
+	mkdir -p $(@D)/.cargo
+	( \
+		echo "[source.crates-io]"; \
+		echo "registry = 'https://github.com/rust-lang/crates.io-index'"; \

Hello,

Quoted 6 lines · Eric Le Bihan

This new package provides Cargo, the Rust official package manager. Cargo is written in Rust and uses Cargo as its build system. It also depends on other Rust packages.

Normally, a previously installed version of Cargo would be used to:

Quoted 5 lines

1. Fetch the dependencies.
2. Build the new version of Cargo, using the available Rust compiler.

But the fetching step prevents offline builds. So instead two features of Cargo are levelled: vendoring [1] and local registry.

Did you want to say "leveraged" instead of "levelled" ?

Quoted 10 lines

package/cargo/Config.in.host new file +4 -0

new file mode 100644
index 0000000000..0f1ca305c6
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_CARGO
+	bool "host cargo"
+	depends on BR2_PACKAGE_HAS_HOST_RUSTC
+	help

package/cargo/Config.in.host line 8

Quoted 4 lines

package/cargo/Config.in.host new file +4 -0

+	  Cargo is the package manager for the Rust programming
+	  language.
+
+	  https://crates.io/

How would "host cargo" be used in the context of Buildroot ? Would it be used by packages that are written in Rust as part of their build process ? What would such packages look like ?

Quoted 6 lines

package/cargo/cargo.hash new file +0 -0

new file mode 100644
index 0000000000..2b2ae43f6b
@@ -0,0 +1,4 @@

package/cargo/cargo.hash line 4

Quoted 4 lines

package/cargo/cargo.hash new file +4 -0

+# Locally generated
+sha256 f4bbe2a8719dbb8da20842235093f7f70f034d01633189e83f75897d68cd274f  cargo-0.23.0.tar.gz
+sha512 9060ec6e67b54f7fad7da8dd8450dd051d62b3f8ed4606196fc238a98beba1c3b43087c787f35d012d9b641c8572e70f50b95b0e01fdd75ed82932b6e6efbbf0  cargo-0.23.0-vendor.tar.xz
+sha256 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae  rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz

Why are you using sha256 sometimes, and sha512 sometimes? Seems like for the cargo-0.23.0-vendor tarball, the hash is not exactly locally generated, but really comes from upstream.

package/cargo/cargo.hash

Quoted 2 lines

package/cargo/cargo.hash new file +2 -0

+HOST_CARGO_DEPENDENCIES = \
+	host-cmake \

Do you need host-cmake absolutely here, or can you use $(BR2_CMAKE_HOST_DEPENDENCY) instead ?

Quoted 34 lines

package/cargo/cargo.hash new file +34 -0

+	host-pkgconf \
+	host-openssl \
+	host-libhttpparser \
+	host-libssh2 \
+	host-libcurl \
+	host-rustc \
+	host-cargo-bin
+
+HOST_CARGO_SNAP_BIN = $(HOST_CARGO_BIN_DIR)/cargo/bin/cargo
+HOST_CARGO_HOME = $(HOST_DIR)/share/cargo
+
+define HOST_CARGO_EXTRACT_DEPS
+	@mkdir -p $(@D)/vendor
+	$(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \
+		$(DL_DIR)/$(CARGO_DEPS_SOURCE) | \
+		$(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) -
+endef
+
+HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS
+
+define HOST_CARGO_EXTRACT_INSTALLER
+	@mkdir -p $(@D)/src/rust-installer
+	$(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \
+		$(DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \
+		$(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) -
+endef
+
+HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER
+
+define HOST_CARGO_SETUP_DEPS
+	mkdir -p $(@D)/.cargo
+	( \
+		echo "[source.crates-io]"; \
+		echo "registry = 'https://github.com/rust-lang/crates.io-index'"; \

package/cargo/cargo.hash

Quoted 10 lines

package/cargo/cargo.hash new file +10 -0

+		echo "replace-with = 'vendored-sources'"; \
+		echo "[source.vendored-sources]"; \
+		echo "directory = '$(@D)/vendor'"; \
+	) > $(@D)/.cargo/config
+endef
+
+HOST_CARGO_PRE_CONFIGURE_HOOKS += HOST_CARGO_SETUP_DEPS
+
+HOST_CARGO_SNAP_OPTS = --release
+HOST_CARGO_SNAP_OPTS += $(if $(VERBOSE),--verbose)

A single assignment would be prettier:

HOST_CARGO_SNAP_OPTS = \
	--release \
	$(if $(VERBOSE),--verbose)

package/cargo/cargo.hash

Quoted 3 lines

package/cargo/cargo.hash new file +3 -0

+HOST_CARGO_ENV = \
+	RUSTFLAGS="-Clink-arg=-Wl,-rpath,$(HOST_DIR)/lib" \
+	CARGO_HOME=$(HOST_DIR)/share/cargo

Why don't you use $(HOST_CARGO_HOME) here ?

package/cargo/cargo.hash

Quoted 7 lines

package/cargo/cargo.hash new file +7 -0

+define HOST_CARGO_BUILD_CMDS
+	(cd $(@D); $(HOST_MAKE_ENV) $(HOST_CARGO_ENV) $(HOST_CARGO_SNAP_BIN) \
+		build $(HOST_CARGO_SNAP_OPTS))
+endef
+
+define HOST_CARGO_INSTALL_CMDS
+	$(INSTALL) -d -m 0755 $(HOST_DIR)/bin

This is not needed, just use the -D option in the command command installing the cargo binary.

package/cargo/cargo.hash

Quoted 10 lines

package/cargo/cargo.hash new file +10 -0

+	$(INSTALL) -m 0755 $(@D)/target/release/cargo $(HOST_DIR)/bin/cargo
+endef
+
+define HOST_CARGO_INSTALL_CONF_FILE
+	$(INSTALL) -D package/cargo/config.in \
+		$(HOST_DIR)/share/cargo/config
+	$(SED) 's/@RUST_TARGET_NAME@/$(RUST_TARGET_NAME)/' \
+		$(HOST_DIR)/share/cargo/config
+	$(SED) 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \
+		$(HOST_DIR)/share/cargo/config

This should be moved inside HOST_CARGO_INSTALL_CMDS, there is no need for a separate post-install hook.

Also, I'm wondering of your choice between generating config files from the .mk file, or having a template that gets tweaked using SED. In this cargo.mk, you are producing a 5 lines file in HOST_CARGO_SETUP_DEPS where only a single value varies (and would need to be tweaked with sed). But on the other hand, you create a two lines share/cargo/config file from a template. Perhaps we should settle on one or the other solution ?

This series adds support for the Rust programming language by adding the following packages:

- rustc: a virtual package for the Rust compiler.
- rust-bin: provides a pre-built version of rustc.
- cargo-bin: provides a pre-built version of Rust package manager.
- rust: builds rustc from source.
- cargo: builds Rust package manager from source.

Hello,

Quoted 8 lines · Eric Le Bihan

This series adds support for the Rust programming language by adding the following packages:

- rustc: a virtual package for the Rust compiler.
- rust-bin: provides a pre-built version of rustc.
- cargo-bin: provides a pre-built version of Rust package manager.
- rust: builds rustc from source.
- cargo: builds Rust package manager from source.

One question: with your series, one can therefore chose whether he wants to build its own Rust compiler and standard library ("rust" package) or use the pre-built Rust compiler and standard library ("rustc-bin" package) ?

In other words, does this means that there are two options:

- User chooses rustc-bin, every Rust package is built using the pre-built compiler, and the pre-built standard library is used.

- User chooses rust. In this case, rust is built using rustc-bin, but every other Rust package will be built with the Rust compiler we have built from source, and will be using the Rust standard library we have built from source.

Is this correct ?

(I'm just trying to understand the overall series.)

Yes, this is correct. The introduction of a virtual package for the Rust compiler was suggested in the mail thread about version v4 of this series [1], as building the compiler from source takes time and using the available pre-built version would speed things up (as done for GCC).

I reviewed the different patches in your series, and I think it's really close to a state where it can be merged. If you can take care of the few comments/questions in the near future, it would definitely help, as I would still have the context in mind.

Two other things that would be nice to do is:

- Add two test cases in support/testing/. One that builds a system with rust-bin, builds a hello world program in Rust, and run it on the target. And another that does the same, but by building the rust compiler from source. Perhaps additional test cases can be added for Cargo, but I'm not sure how it's supposed to be used.

- Add a short section in the documentation that explains how the Rust support in Buildroot is working. This would help people trying to do stuff with Rust to understand how things work.

Two other things that would be nice to do is:

- Add two test cases in support/testing/. One that builds a system with rust-bin, builds a hello world program in Rust, and run it on the target. And another that does the same, but by building the rust compiler from source. Perhaps additional test cases can be added for Cargo, but I'm not sure how it's supposed to be used.

Quoted 3 lines · Thomas Petazzoni

Two other things that would be nice to do is:

Quoted 5 lines

- Add two test cases in support/testing/. One that builds a system with rust-bin, builds a hello world program in Rust, and run it on the target. And another that does the same, but by building the rust compiler from source. Perhaps additional test cases can be added for Cargo, but I'm not sure how it's supposed to be used.

Is there a glibc-based toolchain suitable for arm vexpress available on
http://autobuild.buildroot.org/toolchains/tarballs/?

I see br-aarch64-glibc-2017.05-1078-g95b1dae.tar.bz2, but there is no support for Aarch64 in testing

and no artefacts are available.

Hello Eric,

Quoted 2 lines · Eric Le Bihan

I see br-aarch64-glibc-2017.05-1078-g95b1dae.tar.bz2, but there is no support for Aarch64 in testing

I'm not sure what you mean by "no support for AArch64 in testing". The testing infrastructure can test any arbitrary configuration, so there is nothing like "support for architecture <foo> in testing". Perhaps you are confused by BASIC_TOOLCHAIN_CONFIG being an ARM toolchain configuration. But this BASIC_TOOLCHAIN_CONFIG is not mandatory, it is just one toolchain configuration that you can use if your test doesn't really care about the architecture/toolchain.

We have tests like support/testing/tests/fs/test_iso9660.py that don't use BASIC_TOOLCHAIN_CONFIG.

Quoted 1 line

and no artefacts are available.

I'm not sure what "artefacts" you are looking for here.

Quoted 2 lines

We have tests like support/testing/tests/fs/test_iso9660.py that don't use BASIC_TOOLCHAIN_CONFIG.

Looking at the existing tests, I thought it was a requirement to use toolchains hosted at http://autobuild.buildroot.org/.

Quoted 1 line

I'm not sure what "artefacts" you are looking for here.

I was referring to ARTIFACTS_URL, where ARM versatile/vexpress kernels are available. As I thought I should have used br-aarch64-glibc-2017.05-1078-g95b1dae.tar.bz2 to get a glibc-based toolchain, adding Aarch64 support to the emulator seemed necessary.

I'll go with the Linaro toolchain, using ARM vexpress as target.

Hello,

Quoted 5 lines · Eric Le Bihan

Quoted 2 lines

We have tests like support/testing/tests/fs/test_iso9660.py that don't use BASIC_TOOLCHAIN_CONFIG.

Looking at the existing tests, I thought it was a requirement to use toolchains hosted at http://autobuild.buildroot.org/.

Not at all. We do have some tests that don't use those toolchains. Look at support/testing/tests/boot/test_atf.py, the tests use Linaro toolchains.

Quoted 8 lines

Quoted 1 line

I'm not sure what "artefacts" you are looking for here.

I was referring to ARTIFACTS_URL, where ARM versatile/vexpress kernels are available. As I thought I should have used br-aarch64-glibc-2017.05-1078-g95b1dae.tar.bz2 to get a glibc-based toolchain, adding Aarch64 support to the emulator seemed necessary.

I'll go with the Linaro toolchain, using ARM vexpress as target.

If you want to do runtime test on an AArch64 platform without building the kernel as part of your test configuration, then yes, we would have to add an artifact on http://autobuild.buildroot.net/artefacts/. I can definitely do that if needed.

I'm not super happy with this artefacts solution, but I wanted to avoid putting all those binary files under version control inside the Buildroot repository. If people have better proposals, I'm definitely interested.