aboutsummaryrefslogtreecommitdiffstats
path: root/package/devel
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-11-27 18:08:42 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-11-27 18:08:42 +0000
commit32dcd5d6c7bf7c900300ef10588faca40cbe2704 (patch)
tree3948e85f09e5720f7acc4e46a096f2b95e93f76e /package/devel
parent78cec2cfcaee7f51f0b2d91da693427d3ffe73dc (diff)
downloadupstream-32dcd5d6c7bf7c900300ef10588faca40cbe2704.tar.gz
upstream-32dcd5d6c7bf7c900300ef10588faca40cbe2704.tar.bz2
upstream-32dcd5d6c7bf7c900300ef10588faca40cbe2704.zip
trace-cmd: lazily evaluate extra plugins list, fixes stray build errors causing by missing operands to cp if the package was never built yet
SVN-Revision: 34390
Diffstat (limited to 'package/devel')
-rw-r--r--package/devel/trace-cmd/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile
index c201eb0ecd..1d555db4d4 100644
--- a/package/devel/trace-cmd/Makefile
+++ b/package/devel/trace-cmd/Makefile
@@ -35,9 +35,7 @@ MAKE_FLAGS += \
prefix=/usr
PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/trace-cmd/plugins
-PLUGINS_ALL = $(patsubst $(PLUGINS_DIR)/plugin_%.so,%,$(wildcard $(PLUGINS_DIR)/plugin_*.so))
PLUGINS_MAIN := function hrtimer mac80211 sched_switch
-PLUGINS_EXTRA = $(filter-out $(PLUGINS_MAIN),$(PLUGINS_ALL))
TARGET_CFLAGS += --std=gnu99
@@ -52,7 +50,10 @@ endef
define Package/trace-cmd-extra/install
$(INSTALL_DIR) $(1)/usr/lib/trace-cmd/plugins
$(CP) \
- $(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_EXTRA)) \
+ $$(patsubst %,$(PLUGINS_DIR)/plugin_%.so, \
+ $$(filter-out $(PLUGINS_MAIN), \
+ $$(patsubst $(PLUGINS_DIR)/plugin_%.so,%, \
+ $$(wildcard $(PLUGINS_DIR)/plugin_*.so)))) \
$(1)/usr/lib/trace-cmd/plugins
endef