summaryrefslogtreecommitdiff
path: root/package/asterisk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-26 19:46:58 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-26 19:46:58 (GMT)
commitf03f1d5071caf61c33815b732cef46952324ce6e (patch)
tree8f520fa19ad6da4f651abe6f48ac86485691b54b /package/asterisk
parent60b165e59e044e595b59ec8b6f0ad1dc741ac26d (diff)
fix build on MacOS X, update while here
Diffstat (limited to 'package/asterisk')
-rw-r--r--package/asterisk/Makefile10
-rw-r--r--package/asterisk/patches/patch-Makefile11
-rw-r--r--package/asterisk/patches/patch-Makefile_moddir_rules11
-rw-r--r--package/asterisk/patches/patch-main_Makefile19
-rw-r--r--package/asterisk/patches/patch-main_buildinfo_c13
5 files changed, 59 insertions, 5 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index eeac91c..8e5f96d 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= asterisk
-PKG_VERSION:= 1.6.2.7
+PKG_VERSION:= 1.6.2.10
PKG_RELEASE:= 1
-PKG_MD5SUM:= 861f57ba43bfe05dc645e0679a260e41
+PKG_MD5SUM:= 50412a90942ae7306fb8dcc31a05c2ce
PKG_DESCR:= Open Source PBX
PKG_SECTION:= phone
PKG_MULTI:= 1
@@ -19,7 +19,7 @@ endif
ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
PKG_BUILDDEP+= postgresql
endif
-PKG_URL:= http://www.asterisk.org
+PKG_URL:= http://www.asterisk.org/
PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_TARGET_DEPENDS:= !foxboard
@@ -130,8 +130,8 @@ pre-build:
post-build:
cd ${WRKBUILD}/sounds ; \
- tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \
- rm asterisk-core-sounds-en-gsm-1.4.17.tar.gz
+ tar xzf asterisk-core-sounds-en-gsm-1.4.19.tar.gz ; \
+ rm asterisk-core-sounds-en-gsm-1.4.19.tar.gz
@echo
@echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---"
@echo
diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile
new file mode 100644
index 0000000..6762394
--- /dev/null
+++ b/package/asterisk/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- asterisk-1.6.2.10.orig/Makefile 2010-06-10 22:35:06.000000000 +0200
++++ asterisk-1.6.2.10/Makefile 2010-07-26 19:10:40.000000000 +0200
+@@ -289,7 +289,7 @@ endif
+
+ _ASTCFLAGS+=$(OPTIONS)
+
+-MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
++MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs main res $(LOCAL_MOD_SUBDIRS)
+ OTHER_SUBDIRS:=utils agi
+ SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
+ SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
diff --git a/package/asterisk/patches/patch-Makefile_moddir_rules b/package/asterisk/patches/patch-Makefile_moddir_rules
new file mode 100644
index 0000000..ad6ef82
--- /dev/null
+++ b/package/asterisk/patches/patch-Makefile_moddir_rules
@@ -0,0 +1,11 @@
+--- asterisk-1.6.2.10.orig/Makefile.moddir_rules 2009-07-21 15:56:35.000000000 +0200
++++ asterisk-1.6.2.10/Makefile.moddir_rules 2010-07-26 18:53:03.000000000 +0200
+@@ -117,7 +117,7 @@ clean::
+
+ install:: all
+ @echo "Installing modules from `basename $(CURDIR)`..."
+- @for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
++ for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+
+ uninstall::
+
diff --git a/package/asterisk/patches/patch-main_Makefile b/package/asterisk/patches/patch-main_Makefile
new file mode 100644
index 0000000..1803f5e
--- /dev/null
+++ b/package/asterisk/patches/patch-main_Makefile
@@ -0,0 +1,19 @@
+--- asterisk-1.6.2.10.orig/main/Makefile 2010-06-25 20:58:37.000000000 +0200
++++ asterisk-1.6.2.10/main/Makefile 2010-07-26 19:28:05.000000000 +0200
+@@ -178,14 +178,14 @@ GMIMELDFLAGS+=$(GMIME_LIB)
+ endif
+
+ $(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+- @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
++ $(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
+ $(ECHO_PREFIX) echo " [LD] $^ -> $@"
+ ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+ else
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+ endif
+- $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
++ #$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
+
+ clean::
+ rm -f asterisk
diff --git a/package/asterisk/patches/patch-main_buildinfo_c b/package/asterisk/patches/patch-main_buildinfo_c
new file mode 100644
index 0000000..dce0fb5
--- /dev/null
+++ b/package/asterisk/patches/patch-main_buildinfo_c
@@ -0,0 +1,13 @@
+--- asterisk-1.6.2.10.orig/main/buildinfo.c 2008-10-30 17:49:02.000000000 +0100
++++ asterisk-1.6.2.10/main/buildinfo.c 2010-07-26 19:22:57.000000000 +0200
+@@ -23,8 +23,8 @@
+ * \author Kevin P. Fleming <kpfleming@digium.com>
+ */
+
+-#include "asterisk/buildinfo.h"
+-#include "asterisk/build.h"
++#include "../include/asterisk/buildinfo.h"
++#include "../include/asterisk/build.h"
+
+ const char *ast_build_hostname = BUILD_HOSTNAME;
+ const char *ast_build_kernel = BUILD_KERNEL;