From: Sebastian Kemper Date: Thu, 15 Jul 2021 20:14:07 +0000 (+0200) Subject: kamailio: prevent arm -march overrides X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F657%2Fhead;p=feed%2Ftelephony.git kamailio: prevent arm -march overrides src/Makefile.defs adds "-march=..." to target flags for ARM targets. This can clash with the OpenWrt target flags in CONFIG_TARGET_OPTIMIZATION. If for example the latter is set to "-mcpu=cortex-a9" the following warning is issued: cc1: warning: switch '-mcpu=cortex-a9' conflicts with '-march=armv5t' switch This commit removes these flags. The addition is unwanted when cross-compiling. An issue was raised for this recently, see [1]. [1] https://github.com/openwrt/packages/issues/16135 Signed-off-by: Sebastian Kemper --- diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile index 7a58961..61084ce 100644 --- a/net/kamailio/Makefile +++ b/net/kamailio/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kamailio PKG_VERSION:=5.5.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src PKG_SOURCE:=kamailio-$(PKG_VERSION)_src.tar.gz diff --git a/net/kamailio/patches/070-dont-override-arm-march.patch b/net/kamailio/patches/070-dont-override-arm-march.patch new file mode 100644 index 0000000..0b6a5b4 --- /dev/null +++ b/net/kamailio/patches/070-dont-override-arm-march.patch @@ -0,0 +1,29 @@ +--- a/src/Makefile.defs ++++ b/src/Makefile.defs +@@ -1260,7 +1260,7 @@ ifeq ($(ARCH), arm) + ifeq ($(CC_NAME), gcc) + C_DEFS+=-DCC_GCC_LIKE_ASM + #common stuff +- CFLAGS=-marm -march=armv5t $(CC_OPT) -fsigned-char $(PROFILE) ++ CFLAGS=-marm $(CC_OPT) -fsigned-char $(PROFILE) + #if gcc 4.5+ or 4.2+ + ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) + CFLAGS+= -ftree-vectorize -fno-strict-overflow +@@ -1308,7 +1308,7 @@ ifeq ($(ARCH), arm6) + ifeq ($(CC_NAME), gcc) + C_DEFS+=-DCC_GCC_LIKE_ASM + #common stuff +- CFLAGS=-march=armv6 $(CC_OPT) -fsigned-char \ ++ CFLAGS=$(CC_OPT) -fsigned-char \ + $(PROFILE) + #if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ + ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) +@@ -1355,7 +1355,7 @@ ifeq ($(ARCH), arm7) + ifeq ($(CC_NAME), gcc) + C_DEFS+=-DCC_GCC_LIKE_ASM + #common stuff, use armv7-a as lowest common architecture +- CFLAGS=-march=armv7-a $(CC_OPT) -fsigned-char \ ++ CFLAGS=$(CC_OPT) -fsigned-char \ + $(PROFILE) + #if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+ + ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))