From d7bb78e92d42e57a5cd18d1afe335a4d3354179d Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 3 Oct 2008 14:37:55 +0000 Subject: [PATCH] implement conditional dependencies for generating the Depends: field of ipkgs git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12836 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package-ipkg.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 16378a0f0..de9798413 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -22,6 +22,11 @@ define BuildIPKGVariable $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); 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))) + ifeq ($(DUMP),) define BuildTarget/ipkg IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk @@ -42,7 +47,7 @@ ifeq ($(DUMP),) endif endif - IDEPEND_$(1):=$$(strip $$(DEPENDS)) + IDEPEND_$(1):=$$(call filter_deps,$$(strip $$(DEPENDS))) $(eval $(call BuildIPKGVariable,$(1),conffiles)) $(eval $(call BuildIPKGVariable,$(1),preinst)) -- 2.20.1