asterisk-chan-sccp: autoconf fixes

Since OpenWrt updated autoconf to 2.71 configure fails, because
"$ac_dir" is now empty when configure attempts to run
"./tools/versioncheck". With previous autoconf "$ac_dir" contained
"autoconf" at this point in the script.

As a workaround "$ac_dir" is replaced with "$ac_aux_dir", which
incidentally contains "autoconf".

Also a build dependency is added for gettext-full, as it provides
iconv.m4. Previously this was provided by libiconv, but not anymore.
Without iconv.m4 autoreconf fails.

Some patches were refreshed to allow CI to pass.

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

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