projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bbf0f2f
)
implement conditional dependencies for generating the Depends: field of ipkgs
author
Felix Fietkau
<nbd@openwrt.org>
Fri, 3 Oct 2008 14:37:55 +0000
(14:37 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Fri, 3 Oct 2008 14:37:55 +0000
(14:37 +0000)
SVN-Revision: 12836
include/package-ipkg.mk
patch
|
blob
|
history
diff --git
a/include/package-ipkg.mk
b/include/package-ipkg.mk
index 16378a0f0e0143b4c191dd3727b46904dc3d0a8f..de9798413d3a33a465c7e77c749628058e487931 100644
(file)
--- 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
$(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
ifeq ($(DUMP),)
define BuildTarget/ipkg
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
@@
-42,7
+47,7
@@
ifeq ($(DUMP),)
endif
endif
endif
endif
- IDEPEND_$(1):=$$(
strip $$(DEPENDS
))
+ IDEPEND_$(1):=$$(
call filter_deps,$$(strip $$(DEPENDS)
))
$(eval $(call BuildIPKGVariable,$(1),conffiles))
$(eval $(call BuildIPKGVariable,$(1),preinst))
$(eval $(call BuildIPKGVariable,$(1),conffiles))
$(eval $(call BuildIPKGVariable,$(1),preinst))