Merge pull request #806 from dhewg/buildflags

kamailio: refactor to use PKG_BUILD_FLAGS:=no-mips16

diff --git a/net/asterisk-chan-sccp/Makefile b/net/asterisk-chan-sccp/Makefile
index 7f5e8dc18463b0f1039f3492e90b1e762d464baf..8e350626b0f0d34ba70f1ce32bb0c1ac472dc9a7 100644 (file)
--- a/net/asterisk-chan-sccp/Makefile
+++ b/net/asterisk-chan-sccp/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk-chan-sccp
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 # Updated to v4.3.3 release
 PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
@@ -26,6 +26,9 @@ PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
 PKG_INSTALL:=1
 
+# need iconv.m4, otherwise error during autoreconf
+PKG_BUILD_DEPENDS:=gettext-full
+
 include $(INCLUDE_DIR)/package.mk
 # chan-sccp needs iconv
 include $(INCLUDE_DIR)/nls.mk

diff --git a/net/asterisk-chan-sccp/patches/01-prevent-extra-optimization.patch b/net/asterisk-chan-sccp/patches/01-prevent-extra-optimization.patch
index c6dc4ac770e188e54165342ffe7a6d08eaee678a..6d4b8efa6036a63b97c4c2f2ccb1c1ef6b27c6da 100644 (file)
--- a/net/asterisk-chan-sccp/patches/01-prevent-extra-optimization.patch
+++ b/net/asterisk-chan-sccp/patches/01-prevent-extra-optimization.patch
@@ -1,6 +1,6 @@
 --- a/autoconf/extra.m4
 +++ b/autoconf/extra.m4
-@@ -491,17 +491,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+@@ -516,17 +516,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
                        ], SUPPORTED_CFLAGS)
                ])
                AC_SUBST([strip_binaries])
@@ -16,5 +16,5 @@
 -              esac
 -              CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} "
        ])
- 
+       
        AS_IF([test "X${enable_debug}" == "Xyes"], [

diff --git a/net/asterisk-chan-sccp/patches/02-autoconf-2.70.patch b/net/asterisk-chan-sccp/patches/02-autoconf-2.70.patch
new file mode 100644 (file)
index 0000000..40ed199
--- /dev/null
+++ b/net/asterisk-chan-sccp/patches/02-autoconf-2.70.patch
@@ -0,0 +1,11 @@
+--- a/autoconf/acinclude.m4
++++ b/autoconf/acinclude.m4
+@@ -497,7 +497,7 @@ AC_DEFUN([CS_GET_VERSION], [
+   SCCP_REVISION="unknown"
+ 
+   CURRENT=`pwd`
+-  BASE=`dirname $ac_dir`
++  BASE=`dirname $ac_aux_dir`
+   cd $BASE >/dev/null
+   . ./tools/versioncheck silent
+   cd $CURRENT >/dev/null

diff --git a/net/asterisk-chan-sccp/patches/100-reproducible-builds.patch b/net/asterisk-chan-sccp/patches/100-reproducible-builds.patch
index f10a750586f53619a2285888da0b8669a333e9ed..db1cac94ca915f7e02382f12401f82ff5809f737 100644 (file)
--- a/net/asterisk-chan-sccp/patches/100-reproducible-builds.patch
+++ b/net/asterisk-chan-sccp/patches/100-reproducible-builds.patch
@@ -1,8 +1,6 @@
-Index: chan-sccp-v4.3.0-20171123/src/chan_sccp.c
-===================================================================
---- chan-sccp-v4.3.0-20171123.orig/src/chan_sccp.c
-+++ chan-sccp-v4.3.0-20171123/src/chan_sccp.c
-@@ -186,7 +186,7 @@ boolean_t sccp_postPBX_load(void)
+--- a/src/chan_sccp.c
++++ b/src/chan_sccp.c
+@@ -198,7 +198,7 @@ boolean_t sccp_postPBX_load(void)
  #else
        snprintf(SCCP_REVISIONSTR, sizeof(SCCP_REVISIONSTR), "%s", SCCP_REVISION);
  #endif

diff --git a/net/baresip/Makefile b/net/baresip/Makefile
index 225ebf265ca46c2fb79021d323fba150f757274c..a377d8e5e57fbb972c9be1928d76bde6260a821a 100644 (file)
--- a/net/baresip/Makefile
+++ b/net/baresip/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=baresip
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/baresip/baresip/tar.gz/v$(PKG_VERSION)?

diff --git a/net/baresip/patches/010-fix-parallel-build.patch b/net/baresip/patches/010-fix-parallel-build.patch
new file mode 100644 (file)
index 0000000..25f9013
--- /dev/null
+++ b/net/baresip/patches/010-fix-parallel-build.patch
@@ -0,0 +1,23 @@
+From d7aeb9393876af3746dacdbacd70c4a5d6dfcf39 Mon Sep 17 00:00:00 2001
+From: Christian Spielberger <c.spielberger@commend.com>
+Date: Sun, 23 May 2021 10:01:04 +0200
+Subject: [PATCH] ctrl_dbus: add dependency to baresipbus.h (#1447) (#1457)
+
+---
+ modules/ctrl_dbus/module.mk | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/modules/ctrl_dbus/module.mk
++++ b/modules/ctrl_dbus/module.mk
+@@ -16,7 +16,10 @@ $(MOD)_CFLAGS       += -Wno-unused-parameter -
+ 
+ $(MOD)_CCHECK_OPT     = -e baresipbus.h -e baresipbus.c
+ 
+-modules/ctrl_dbus/baresipbus.h modules/ctrl_dbus/baresipbus.c: \
++modules/$(MOD)/baresipbus.o : modules/$(MOD)/baresipbus.h
++modules/$(MOD)/ctrl_dbus.o :  modules/$(MOD)/baresipbus.h
++
++modules/$(MOD)/baresipbus.h modules/$(MOD)/baresipbus.c: \
+       modules/ctrl_dbus/com.github.Baresip.xml
+       @cd $(dir $@) && ./gen.sh
+