diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-03-28 19:22:59 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-03-28 19:22:59 +0000 |
| commit | 5e7275d8237a359114e068be6a19f3b169d3b89b (patch) | |
| tree | 065b19ac706d6b61a530bced6fbdacffa92188a0 | |
| parent | 489fb5eceb1e9c522c259a08e1e15f54a866212f (diff) | |
| download | upstream-5e7275d8237a359114e068be6a19f3b169d3b89b.tar.gz upstream-5e7275d8237a359114e068be6a19f3b169d3b89b.tar.bz2 upstream-5e7275d8237a359114e068be6a19f3b169d3b89b.zip | |
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20553 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package-ipkg.mk | 11 |
1 files changed, 9 insertions, 2 deletions
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 |