Ignore:
Timestamp:
2010-03-28T21:22:59+02:00 (7 years ago)
Author:
hauke
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/package-ipkg.mk

    r18464 r20553  
    2525endef 
    2626 
     27PARENL :=( 
     28PARENR :=) 
     29 
    2730dep_split=$(subst :,$(space),$(1)) 
    28 dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1))) 
     31dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1)))))) 
     32dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(CONFIG_$(cond)))) 
     33dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1))) 
     34dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1))) 
     35dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1))) 
    2936dep_val=$(word 2,$(call dep_split,$(1))) 
    3037strip_deps=$(strip $(subst +,,$(filter-out @%,$(1)))) 
    31 filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(if $($(call dep_confvar,$(dep))),$(call dep_val,$(dep))),$(dep))) 
     38filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep))) 
    3239 
    3340ifeq ($(DUMP),) 
Note: See TracChangeset for help on using the changeset viewer.