mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-05 14:09:53 +03:00
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>
This commit is contained in:
committed by
Peter Korsgaard
parent
9447e86618
commit
514291f39e
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user