From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 18 Jul 2013 16:44:44 +0000 (+0000)
Subject: build: fix IGNORE_ERRORS for sources packages that match both 'y' and 'm'
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4af1bb818c0c9784cb402e8a88546f69e2f1691e;p=openwrt%2Fstaging%2Fyousong.git

build: fix IGNORE_ERRORS for sources packages that match both 'y' and 'm'

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37405
---

diff --git a/package/Makefile b/package/Makefile
index df7cf79f2e..f8002348b1 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -16,7 +16,12 @@ else
   $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
 endif
 ifneq ($(IGNORE_ERRORS),)
-  $(curdir)/builddirs-ignore-compile:= $(if $(filter n m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(subst n,,$(m)))),$(package-m) $(package-))
+  package-y-filter := $(package-y)
+  package-m-filter := $(filter-out $(package-y),$(package-m))
+  package-n-filter := $(filter-out $(package-y) $(package-m),$(package-))
+  package-ignore-errors := $(filter n m y,$(IGNORE_ERRORS))
+  package-ignore-errors := $(if $(package-ignore-errors),$(package-ignore-errors),n m)
+  $(curdir)/builddirs-ignore-compile := $(foreach m,$(package-ignore-errors),$(package-$(m)-filter))
 endif
 
 ifdef CONFIG_USE_MKLIBS