NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/pkg-cargo: provide a single definition of CARGO_HOME value

Browse Source 
Instead of replicating $(HOST_DIR)/share/cargo in several place,
define BR_CARGO_HOME. This will help when we'll want to change this
location.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Thomas Petazzoni 2022-11-03 23:45:37 +01:00 committed by Yann E. MORIN
parent 1459b7a863
commit 3dde279269
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/pkg-cargo.mk
View File

@ -20,8 +20,10 @@
#
################################################################################
BR_CARGO_HOME = $(HOST_DIR)/share/cargo
PKG_COMMON_CARGO_ENV = \
CARGO_HOME=$(HOST_DIR)/share/cargo
CARGO_HOME=$(BR_CARGO_HOME)
# __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS is needed to allow
# passing the -Z target-applies-to-host, which is needed together with
@ -79,7 +81,7 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc
$(2)_DEPENDENCIES += host-rustc
$(2)_DOWNLOAD_POST_PROCESS = cargo
$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo
$(2)_DL_ENV += CARGO_HOME=$$(BR_CARGO_HOME)
# If building in a sub directory, use that to find the Cargo.toml
ifneq ($$($(2)_SUBDIR),)

2
package/suricata/suricata.mk
View File

@ -29,7 +29,7 @@ SURICATA_DEPENDENCIES = \
SURICATA_CONF_ENV = \
ac_cv_path_HAVE_SPHINXBUILD=no \
CARGO_HOME=$(HOST_DIR)/share/cargo \
CARGO_HOME=$(BR_CARGO_HOME) \
RUST_TARGET=$(RUSTC_TARGET_NAME)
SURICATA_CONF_OPTS = \