projects
/
openwrt
/
staging
/
lynxis
/
omap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f89a1f
)
Some dependencies that are depending on target are not added into the Depends line...
author
Hauke Mehrtens
<hauke@hauke-m.de>
Sun, 28 Mar 2010 19:22:59 +0000
(19:22 +0000)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sun, 28 Mar 2010 19:22:59 +0000
(19:22 +0000)
This fixes #6874
SVN-Revision: 20553
include/package-ipkg.mk
patch
|
blob
|
history
diff --git
a/include/package-ipkg.mk
b/include/package-ipkg.mk
index 1ddd80a8dc11031bae9516b9b19c37ff4ab4c1e7..87b142aa594490661ee093cd4a83b07e3e7d3030 100644
(file)
--- a/
include/package-ipkg.mk
+++ b/
include/package-ipkg.mk
@@
-24,11
+24,18
@@
define BuildIPKGVariable
$(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
endef
$(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
endef
+PARENL :=(
+PARENR :=)
+
dep_split=$(subst :,$(space),$(1))
dep_split=$(subst :,$(space),$(1))
-dep_confvar=CONFIG_$(word 1,$(call dep_split,$(1)))
+dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
+dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(CONFIG_$(cond))))
+dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
+dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
+dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
dep_val=$(word 2,$(call dep_split,$(1)))
strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
dep_val=$(word 2,$(call dep_split,$(1)))
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)))
+filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(
call dep_if,$(dep
)),$(dep)))
ifeq ($(DUMP),)
define BuildTarget/ipkg
ifeq ($(DUMP),)
define BuildTarget/ipkg