Merge pull request #599 from micmac1/dahto-fix-patch

dahdi-tools: remove broken patch, disable unused features
This commit is contained in:
micmac1 2021-01-01 23:05:15 +01:00 committed by GitHub
commit 9994df7ffd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 38 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dahdi-tools PKG_NAME:=dahdi-tools
PKG_VERSION:=3.1.0 PKG_VERSION:=3.1.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
@ -52,7 +52,16 @@ define Package/dahdi-tools-libtonezone
TITLE:=DAHDI tonezone library TITLE:=DAHDI tonezone library
endef endef
CONFIGURE_ARGS+=--disable-silent-rules CONFIGURE_ARGS += \
--disable-silent-rules \
--with-perllib="" \
--without-libusb \
--without-libusbx \
--without-newt \
--without-pcap \
--without-ppp \
--without-selinux \
--without-usb
# https://issues.asterisk.org/jira/browse/DAHTOOL-85 # https://issues.asterisk.org/jira/browse/DAHTOOL-85
TARGET_CFLAGS+=-fcommon TARGET_CFLAGS+=-fcommon

View file

@ -1,36 +0,0 @@
--- a/xpp/xtalk/debug.c
+++ b/xpp/xtalk/debug.c
@@ -26,7 +26,9 @@
#include <stdlib.h>
#include <stdarg.h>
#include <syslog.h>
+#ifdef HAVE_EXECINFO_H
#include <execinfo.h>
+#endif
#include <xtalk/debug.h>
#include <autoconfig.h>
@@ -61,6 +63,7 @@ void dump_packet(int loglevel, int mask,
/* from glibc info(1) */
void print_backtrace(FILE *fp)
{
+#ifdef HAVE_EXECINFO_H
void *array[10];
size_t size;
char **strings;
@@ -71,4 +74,5 @@ void print_backtrace(FILE *fp)
for (i = 0; i < size; i++)
fprintf(fp, "%s\n", strings[i]);
free(strings);
+#endif
}
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,7 @@ AC_SUBST(DAHDI_DECLARATION_AFTER_STATEME
# Checks for header files.
AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h])
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
+AC_CHECK_HEADERS([execinfo.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE