summaryrefslogtreecommitdiffstats
path: root/package/cargo
diff options
context:
space:
mode:
authorMaxime Hadjinlian <maxime.hadjinlian@gmail.com>2018-04-02 15:09:24 +0200
committerPeter Korsgaard <peter@korsgaard.com>2018-04-02 15:53:53 +0200
commit514291f39ef066cbe4dd9b41e1a3b0268fc8efb8 (patch)
tree3b5ddd54ca0e3583ddeeb4527f71e09472b712bb /package/cargo
parent9447e866187728009addf0cc62aa0c6b293b6dcd (diff)
downloadbuildroot-514291f39ef066cbe4dd9b41e1a3b0268fc8efb8.tar.gz
buildroot-514291f39ef066cbe4dd9b41e1a3b0268fc8efb8.zip
packages: use new $($PKG)_DL_DIR) variable
Instead of DL_DIR, the package should now use $(PKG)_DL_DIR to ease the transition into a new directory structure for DL_DIR. This commit has been generated with the following scripts: for i in $(find . -iname "*.mk"); do if ! grep -q "\$(DL_DIR)" ${i}; then continue fi pkg_name="$(basename $(dirname ${i}))" [ "${pkg_name}" = "package" ] && continue raw_pkg_name=$(echo ${pkg_name} | tr [a-z] [A-Z] | tr '-' '_') pkg_dl_dir="${raw_pkg_name}_DL_DIR" sed -i "s/\$(DL_DIR)/\$($pkg_dl_dir)/" ${i} done Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/cargo')
-rw-r--r--package/cargo/cargo.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk
index 3fd088d727..36b2718e90 100644
--- a/package/cargo/cargo.mk
+++ b/package/cargo/cargo.mk
@@ -37,7 +37,7 @@ 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) | \
+ $(CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \
$(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) -
endef
@@ -46,7 +46,7 @@ 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) | \
+ $(CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \
$(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) -
endef
OpenPOWER on IntegriCloud