This patch includes Makefile changes for chan-sccp-b V4.1-RC1 compiled against the asterisk-1.8.x package.

Signed-off-by: Diederik de Groot <ddegroot@users.sourceforge.net>
[slachta@cesnet.cz: dependency fixes which prevents breaking menuconfig items to be split]
Tested-by: Jiri Slachta <slachta@cesnet.cz>
Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
This commit is contained in:
Jiri Slachta 2013-05-14 18:21:52 +02:00
parent 48e8b9ec4f
commit c9f5bea044
3 changed files with 8 additions and 34 deletions

View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk18-chan-sccp-b
PKG_REV=3004
PKG_REV=4631
PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1
@ -18,6 +18,8 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=svn
PKG_FIXUP:=autoreconf -fi
include $(INCLUDE_DIR)/package.mk
define Package/asterisk18-chan-sccp-b
@ -34,12 +36,13 @@ define Package/asterisk18-chan-sccp-b/description
by asterisk by default.
endef
CONFIGURE_ARGS += \
--with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8
define Build/Configure
$(call Build/Configure/Default,--with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8)
endef
define Build/Compile
$(MAKE) -C "$(PKG_BUILD_DIR)" \
CFLAGS="$(CFLAGS) -DLOW_MEMORY" \
CFLAGS="$(CFLAGS) -I$(PKG_BUILD_DIR)/src -DLOW_MEMORY" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
@ -50,7 +53,7 @@ endef
define Package/asterisk18-chan-sccp-b/install
$(INSTALL_DIR) $(1)/etc/asterisk
$(INSTALL_BIN) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf
$(CP) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/
endef

View file

@ -1,19 +0,0 @@
--- a/src/chan_sccp.h
+++ b/src/chan_sccp.h
@@ -127,15 +127,7 @@ extern "C" {
# define CHECK_LEAKS()
# endif
-# define SCCP_FILE_VERSION(file, version) \
- static void __attribute__((constructor)) __register_file_version(void) \
- { \
- pbx_register_file_version(file, version); \
- } \
- static void __attribute__((destructor)) __unregister_file_version(void) \
- { \
- pbx_unregister_file_version(file); \
- }
+# define SCCP_FILE_VERSION(file, version)
# define DEV_ID_LOG(x) x ? x->id : "SCCP"

View file

@ -1,10 +0,0 @@
--- a/src/chan_sccp.h
+++ b/src/chan_sccp.h
@@ -32,6 +32,7 @@ extern "C" {
#include "common.h"
#include <poll.h>
#include "asterisk/compiler.h"
+#include <stdarg.h>
#include "asterisk/lock.h"
#include "asterisk/abstract_jb.h"