diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-10-27 17:24:27 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-10-27 17:24:27 +0000 |
| commit | 6290f02fd28c21c7a65adeeaa05e7fd43f4cbf8d (patch) | |
| tree | 1a74ce114ea8d98264b659f3f17c25967ef5b715 | |
| parent | 7f8cad5eeb1916f10c61634df15999c0ba8b6776 (diff) | |
fix conditional depends in ipkg control files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13051 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package-ipkg.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index de9798413..c5d4916c2 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -25,7 +25,8 @@ endef dep_split=$(subst :,$(space),$(1)) dep_confvar=CONFIG_$(word 1,$(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),) define BuildTarget/ipkg @@ -47,7 +48,7 @@ ifeq ($(DUMP),) endif endif - IDEPEND_$(1):=$$(call filter_deps,$$(strip $$(DEPENDS))) + IDEPEND_$(1):=$$(call filter_deps,$$(DEPENDS)) $(eval $(call BuildIPKGVariable,$(1),conffiles)) $(eval $(call BuildIPKGVariable,$(1),preinst)) |