[#5760] fix asterisk build
Submitted By: Peter Meerwald
Open Date
2009-12-08 06:11:50
Priority:
Medium Assignee:
Nobody
Status:
Open Fixed In Release:
N/A
Found In Release:
snaps Release:
Category:
uClinux-dist applications Board:
N/A
Processor:
ALL Silicon Revision:
Is this bug repeatable?:
Yes Resolution:
N/A
Uboot version or rev.:
Toolchain version or rev.:
09r1-10
App binary format:
N/A
Summary: fix asterisk build
Details:
I don't know if the old asterisk 1.0.7 checked into uclinux-dist is of much value nowadays... but here are some patches to make it compile at least
I'm not sure about the patch to user/asterisk/db1-ast/db/db.c, modern asterisk source (1.6) doesn't have that cruft so it simply removed it
diff --git a/user/Kconfig b/user/Kconfig
index 9c4818f..a40a1c3 100644
--- a/user/Kconfig
+++ b/user/Kconfig
@@ -865,6 +865,7 @@ config USER_ASTERISK
select LIB_STLPORT
select LIB_STLPORT_SHARED
select LIB_EXPAT
+ select LIB_LIBSSL
help
Asterisk is a software-based PBX
diff --git a/user/asterisk/Makefile b/user/asterisk/Makefile
index 740a273..700c3d1 100644
--- a/user/asterisk/Makefile
+++ b/user/asterisk/Makefile
@@ -359,7 +359,7 @@ MODULES=apps/app_db.so apps/app_echo.so apps/app_read.so \
romfs:
$(ROMFSINST) /bin/asterisk
- mkdir -p $(ROMFSDIR)/etc/config/asterisk $(ROMFSDIR)/var/lib/asterisk $(ROMFSDIR)/lib/asterisk/modules $(ROMFSDIR)/var/spool/ast
+ mkdir -p $(ROMFSDIR)/etc/config/asterisk $(ROMFSDIR)/var/lib/asterisk $(ROMFSDIR)/lib/asterisk/modules/apps $(ROMFSDIR)/lib/aste
for i in $(MODULES); do $(ROMFSINST) $$i /lib/asterisk/modules/$$i; done
cp configs.romfs/*.conf configs.romfs/*.adsi $(ROMFSDIR)/etc/config/asterisk/
diff --git a/user/asterisk/channels/chan_phone.c b/user/asterisk/channels/chan_phone.c
index d817776..d7fd907 100644
--- a/user/asterisk/channels/chan_phone.c
+++ b/user/asterisk/channels/chan_phone.c
@@ -34,9 +34,6 @@
#include <linux/telephony.h>
/* Still use some IXJ specific stuff */
#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-# include <linux/compiler.h>
-#endif
#include <linux/ixjuser.h>
#include "DialTone.h"
diff --git a/user/asterisk/db1-ast/db/db.c b/user/asterisk/db1-ast/db/db.c
index 5a74061..e90dd1a 100644
--- a/user/asterisk/db1-ast/db/db.c
+++ b/user/asterisk/db1-ast/db/db.c
@@ -44,9 +44,9 @@ static char sccsid[] = "@(#)db.c 8.4 (Berkeley) 2/21/94";
#include <db.h>
-#ifndef __APPLE__
-#define dbopen __dbopen
-#endif
+//#ifndef __APPLE__
+//#define dbopen __dbopen
+//#endif
DB *
dbopen(fname, flags, mode, type, openinfo)
@@ -76,12 +76,12 @@ dbopen(fname, flags, mode, type, openinfo)
errno = EINVAL;
return (NULL);
}
-#ifndef __APPLE__
-#undef dbopen
-#define weak_alias(original, alias) \
- asm (".weak " #alias "\n" #alias " = " #original);
-weak_alias (__dbopen, dbopen)
-#endif
+//#ifndef __APPLE__
+//#undef dbopen
+//#define weak_alias(original, alias) \
+// asm (".weak " #alias "\n" #alias " = " #original);
+//weak_alias (__dbopen, dbopen)
+//#endif
static int
__dberr __P((void))
diff --git a/user/asterisk/make_build_h b/user/asterisk/make_build_h
old mode 100644
new mode 100755
diff --git a/user/asterisk/mkdep b/user/asterisk/mkdep
old mode 100644
new mode 100755
Follow-ups
No Messages Were Found
Files
Changes
Commits
Dependencies
Duplicates
Associations
Tags
File Name File Type File Size Posted By
No Files Were Found