提交 3b0a9ac8 编写于 作者: S Sebastian Kemper

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: NSebastian Kemper <sebastian_ml@gmx.net>
上级 f79f6246
......@@ -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
......
--- 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"], [
--- 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
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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册