jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustc: use RUSTC_{HOST,TARGET}_NAME

Browse Source 
utils/check-package complains as follows:

  package/rustc/rustc.mk:10: possible typo: RUST_TARGET_NAME -> *RUSTC*
  package/rustc/rustc.mk:18: possible typo: RUST_HOST_NAME -> *RUSTC*

As RUST_{HOST,TARGET}_NAME are related to the Rust compiler, it
sounds sensible to rename them to RUSTC_{HOST,TARGET}_NAME.

So update all rust related packages to use the new variables.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Eric Le Bihan 2018-02-13 08:21:27 +01:00 committed by Thomas Petazzoni
parent eb303348b5
commit f69c519267
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/manual/adding-packages-cargo.txt
View File

@ -49,11 +49,11 @@ package. Let's start with an example:
15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo 15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo
16: FOO_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release) 16: FOO_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release)
17: 17:
18: FOO_BIN_DIR = target/$(RUST_TARGET_NAME)/$(FOO_CARGO_MODE) 18: FOO_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(FOO_CARGO_MODE)
19: 19:
20: FOO_CARGO_OPTS = \ 20: FOO_CARGO_OPTS = \
21: --$(FOO_CARGO_MODE) \ 21: --$(FOO_CARGO_MODE) \
22: --target=$(RUST_TARGET_NAME) \ 22: --target=$(RUSTC_TARGET_NAME) \
23: --manifest-path=$(@D)/Cargo.toml 23: --manifest-path=$(@D)/Cargo.toml
24: 24:
25: define FOO_BUILD_CMDS 25: define FOO_BUILD_CMDS

2
package/cargo-bin/cargo-bin.mk
View File

@ -6,7 +6,7 @@
CARGO_BIN_VERSION = 0.24.0 CARGO_BIN_VERSION = 0.24.0
CARGO_BIN_SITE = https://static.rust-lang.org/dist CARGO_BIN_SITE = https://static.rust-lang.org/dist
CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUST_HOST_NAME).tar.xz CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz
CARGO_BIN_LICENSE = Apache-2.0 or MIT CARGO_BIN_LICENSE = Apache-2.0 or MIT
CARGO_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT CARGO_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT

2
package/cargo/cargo.mk
View File

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

2
package/cargo/config.in
View File

@ -1,2 +1,2 @@
[target.@RUST_TARGET_NAME@] [target.@RUSTC_TARGET_NAME@]
linker = "@CROSS_PREFIX@gcc" linker = "@CROSS_PREFIX@gcc"

14
package/rust-bin/rust-bin.mk
View File

@ -11,13 +11,13 @@ RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
HOST_RUST_BIN_PROVIDES = host-rustc HOST_RUST_BIN_PROVIDES = host-rustc
HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUST_HOST_NAME).tar.xz HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz
HOST_RUST_BIN_EXTRA_DOWNLOADS = \ HOST_RUST_BIN_EXTRA_DOWNLOADS = \
rust-std-$(RUST_BIN_VERSION)-$(RUST_HOST_NAME).tar.xz \ rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz \
rust-std-$(RUST_BIN_VERSION)-$(RUST_TARGET_NAME).tar.xz rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME).tar.xz
HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUST_HOST_NAME)/rust-std-$(RUST_HOST_NAME) HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME)/rust-std-$(RUSTC_HOST_NAME)
define HOST_RUST_BIN_LIBSTD_EXTRACT define HOST_RUST_BIN_LIBSTD_EXTRACT
mkdir -p $(@D)/std mkdir -p $(@D)/std
@ -26,7 +26,7 @@ define HOST_RUST_BIN_LIBSTD_EXTRACT
$(TAR) -C $(@D)/std $(TAR_OPTIONS) - $(TAR) -C $(@D)/std $(TAR_OPTIONS) -
) )
cd $(@D)/rustc/lib/rustlib; \ cd $(@D)/rustc/lib/rustlib; \
ln -sf ../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUST_HOST_NAME) ln -sf ../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)
endef endef
HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT
@ -42,12 +42,12 @@ define HOST_RUST_BIN_INSTALL_RUSTC
endef endef
define HOST_RUST_BIN_INSTALL_LIBSTD_HOST define HOST_RUST_BIN_INSTALL_LIBSTD_HOST
(cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUST_HOST_NAME); \ (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME); \
./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS))
endef endef
define HOST_RUST_BIN_INSTALL_LIBSTD_TARGET define HOST_RUST_BIN_INSTALL_LIBSTD_TARGET
(cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUST_TARGET_NAME); \ (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME); \
./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS))
endef endef
endif endif

4
package/rust/rust.mk
View File

@ -48,7 +48,7 @@ HOST_RUST_POST_EXTRACT_HOOKS += HOST_RUST_EXCLUDE_ORIG_FILES
define HOST_RUST_CONFIGURE_CMDS define HOST_RUST_CONFIGURE_CMDS
( \ ( \
echo '[build]'; \ echo '[build]'; \
echo 'target = ["$(RUST_TARGET_NAME)"]'; \ echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \
echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \ echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \
echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \
echo 'python = "$(HOST_DIR)/bin/python2"'; \ echo 'python = "$(HOST_DIR)/bin/python2"'; \
@ -61,7 +61,7 @@ define HOST_RUST_CONFIGURE_CMDS
echo 'prefix = "$(HOST_DIR)"'; \ echo 'prefix = "$(HOST_DIR)"'; \
echo '[rust]'; \ echo '[rust]'; \
echo 'use-jemalloc = $(HOST_RUST_JEMALLOC_ENABLED)'; \ echo 'use-jemalloc = $(HOST_RUST_JEMALLOC_ENABLED)'; \
echo '[target.$(RUST_TARGET_NAME)]'; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \
echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \
echo $(HOST_RUST_JEMALLOC_CONF); \ echo $(HOST_RUST_JEMALLOC_CONF); \
) > $(@D)/config.toml ) > $(@D)/config.toml

4
package/rustc/rustc.mk
View File

@ -7,7 +7,7 @@
RUSTC_ARCH = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ARCH)) RUSTC_ARCH = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ARCH))
RUSTC_ABI = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ABI)) RUSTC_ABI = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ABI))
RUST_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI) RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI)
ifeq ($(HOSTARCH),x86) ifeq ($(HOSTARCH),x86)
RUSTC_HOST_ARCH = i686 RUSTC_HOST_ARCH = i686
@ -15,6 +15,6 @@ else
RUSTC_HOST_ARCH = $(HOSTARCH) RUSTC_HOST_ARCH = $(HOSTARCH)
endif endif
RUST_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu
$(eval $(host-virtual-package)) $(eval $(host-virtual-package))