mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

fix conditional depends in ipkg control files 

SVN-Revision: 13051
This commit is contained in:
Felix Fietkau 2008-10-27 17:24:27 +00:00
parent 3203828ce8
commit 38b513811c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/package-ipkg.mk
View File

@ -25,7 +25,8 @@ endef
dep_split=$(subst :,$(space),$(1)) dep_split=$(subst :,$(space),$(1))
dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1))) dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1)))
dep_val=$(word 2,$(call dep_split,$(1))) dep_val=$(word 2,$(call dep_split,$(1)))
filter_deps=$(foreach dep,$(1),$(if $(findstring :,$(dep)),$(if $($(call dep_confvar,$(dep))),$(call dep_val,$(dep))),$(dep))) 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)))
ifeq ($(DUMP),) ifeq ($(DUMP),)
define BuildTarget/ipkg define BuildTarget/ipkg
@ -47,7 +48,7 @@ ifeq ($(DUMP),)
endif endif
endif endif
IDEPEND_$(1):=$$(call filter_deps,$$(strip $$(DEPENDS))) IDEPEND_$(1):=$$(call filter_deps,$$(DEPENDS))
$(eval $(call BuildIPKGVariable,$(1),conffiles)) $(eval $(call BuildIPKGVariable,$(1),conffiles))
$(eval $(call BuildIPKGVariable,$(1),preinst)) $(eval $(call BuildIPKGVariable,$(1),preinst))