diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-07-18 16:44:44 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-18 16:44:44 +0000 |
| commit | fc0a873b83eaaa83e6df242073f69b83a6ff1747 (patch) | |
| tree | 188cb4451004a606cbab62ec39d5d56b0abca22b /package/Makefile | |
| parent | 91a862aead9473daa7078349def671edb695a63e (diff) | |
| download | upstream-fc0a873b83eaaa83e6df242073f69b83a6ff1747.tar.gz upstream-fc0a873b83eaaa83e6df242073f69b83a6ff1747.tar.bz2 upstream-fc0a873b83eaaa83e6df242073f69b83a6ff1747.zip | |
build: fix IGNORE_ERRORS for sources packages that match both 'y' and 'm'
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37405 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/Makefile')
| -rw-r--r-- | package/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
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 |