From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 28 Mar 2010 19:22:59 +0000 (+0000)
Subject: Some dependencies that are depending on target are not added into the Depends line... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3dd6909c2008a5287b3bea27e091219e1aeedf22;p=openwrt%2Fstaging%2Fneocturne.git

Some dependencies that are depending on target are not added into the Depends line in the control file of the package. For example +!(TARGET_brcm47xx||TARGET_brcm63xx):kmod-ssb does not result in kmod-ssb for the x86 target or any other target.

This fixes #6874

SVN-Revision: 20553
---

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 1ddd80a8dc..87b142aa59 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -24,11 +24,18 @@ define BuildIPKGVariable
   $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
 endef
 
+PARENL :=(
+PARENR :=)
+
 dep_split=$(subst :,$(space),$(1))
-dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1)))
+dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
+dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(CONFIG_$(cond))))
+dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
+dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
+dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
 dep_val=$(word 2,$(call dep_split,$(1)))
 strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
-filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(if $($(call dep_confvar,$(dep))),$(call dep_val,$(dep))),$(dep)))
+filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep)))
 
 ifeq ($(DUMP),)
   define BuildTarget/ipkg