aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-11-28 19:55:52 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-12-05 19:37:32 +0100
commit6ea4a54722b23db24c9c8b62769813a116b67751 (patch)
tree73be722ae20ced1c093e92acf09184641577eaa3
parent0dd2597fff13dcbeac306c71c91c9b366af1097d (diff)
downloadbuildroot-6ea4a54722b23db24c9c8b62769813a116b67751.tar.gz
buildroot-6ea4a54722b23db24c9c8b62769813a116b67751.tar.bz2
package/pkg-generic.mk: make HOST_<pkg>_DL_OPTS inherit from <pkg>_DL_OPTS
Just like _SITE, _SOURCE, _SITE_METHOD, it is very likely that if <pkg>_DL_OPTS is defined, the same value should be used for HOST_<pkg>_DL_OPTS, so let's have the same inheritance logic than the one we have for other variables. Fixes: https://bugs.busybox.net/show_bug.cgi?id=12321 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 085f32c17b408fbac68d92232b42d49e883e1f69) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pkg-generic.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index e14714cf40..d8129942e9 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -540,6 +540,12 @@ ifndef $(2)_SITE_METHOD
endif
endif
+ifndef $(2)_DL_OPTS
+ ifdef $(3)_DL_OPTS
+ $(2)_DL_OPTS = $$($(3)_DL_OPTS)
+ endif
+endif
+
ifneq ($$(filter bzr cvs hg svn,$$($(2)_SITE_METHOD)),)
BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE)
endif