From eef0679cb4035857178c7adfa2667bcc8c605855 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Mon, 5 Nov 2018 21:57:47 +0100 Subject: [PATCH] kamailio-5.x: amend mips2 tweak Commit f84dda74e615c803e6a218cea83dd2a2bfaa67e5 ("kamailio-5.x: enable FAST_LOCK for MIPS") turned out to be problematic, because it changed the ARCH to "mips2" not only for "mips", but also for some "mipsel" targets, which was unintentional. Address this by filtering for "mips" specifically before setting the variable. Also, get rid of PKG_BUILD_PARALLEL, because adding it really didn't change anything - due to the way "make" is called. Leave a comment to prevent repetition (read: prevent _me_ from doing the same mistake again in the future). Signed-off-by: Sebastian Kemper --- net/kamailio-5.x/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/kamailio-5.x/Makefile b/net/kamailio-5.x/Makefile index e5aa478..9bf139c 100644 --- a/net/kamailio-5.x/Makefile +++ b/net/kamailio-5.x/Makefile @@ -21,7 +21,8 @@ PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jiri Slachta -PKG_BUILD_PARALLEL:=1 +# Defining PKG_BUILD_PARALLEL to 1 would be a noop due to the way we call make +#PKG_BUILD_PARALLEL:=1 MODULES_AVAILABLE:= \ acc \ @@ -379,7 +380,9 @@ EXTRA_MODULES:= \ # # When CONFIG_CPU_TYPE matches one of the identifiers in the list below, set # ARCH to "mips2" to get FAST_LOCK support. +ifeq ($(call qstrip,$(CONFIG_ARCH)),mips) CPU_MIPS2:=mips32 24kc 34kc 74kc +endif PKG_MAKE_ARGS:= \ prefix=/ \