From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Fri, 23 Jul 2021 15:15:46 +0000 (+0200)
Subject: kamailio: replace patch with sed script
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F662%2Fhead;p=feed%2Ftelephony.git

kamailio: replace patch with sed script

On the build bots the patch patches clashes with Build/Prepare. This
commit removes it in favor of a simple sed script. The resulting change
is identical.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/kamailio/Makefile b/net/kamailio/Makefile
index 61084ce..5478f4c 100644
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@@ -433,6 +433,9 @@ define Build/Prepare
 	# Upstream adds "-funroll-loops" to compiler flags, which increases
 	# binary size significantly. Remove this flag.
 	$(SED) 's/[ ]*-funroll-loops//' $(PKG_BUILD_DIR)/src/Makefile.defs
+	# Also remove -march=arm... flags as they can clash with
+	# CONFIG_TARGET_OPTIMIZATION.
+	$(SED) 's/-march=armv[0-7a-z-]*[ ]*//' $(PKG_BUILD_DIR)/src/Makefile.defs
 endef
 
 define Build/Configure
diff --git a/net/kamailio/patches/070-dont-override-arm-march.patch b/net/kamailio/patches/070-dont-override-arm-march.patch
deleted file mode 100644
index 0b6a5b4..0000000
--- a/net/kamailio/patches/070-dont-override-arm-march.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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))))