From c98b63ed59feb6ad483afb1b1ce55c10e0b93dfb Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 28 Mar 2010 19:22:59 +0000 Subject: [PATCH] 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 --- include/package-ipkg.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 1ddd80a8d..87b142aa5 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 -- 2.20.1