From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Nov 2012 18:08:42 +0000 (+0000)
Subject: trace-cmd: lazily evaluate extra plugins list, fixes stray build errors causing by... 
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=7dec93c04e2205ccd68045a7814c9ea885cefc36

trace-cmd: lazily evaluate extra plugins list, fixes stray build errors causing by missing operands to cp if the package was never built yet

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34390 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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