summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-01-26 06:28:03 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2009-01-26 06:28:03 +0000
commit329f68e7947f2e1c4017bd51ac08bf535b48bbd1 (patch)
tree886ed338eb10f6149ee2e730e515fd2f8847d641
parent3ba91efea21466d0f587656903941c339eaa6bdf (diff)
downloadbuildroot-novena-329f68e7947f2e1c4017bd51ac08bf535b48bbd1.tar.gz
buildroot-novena-329f68e7947f2e1c4017bd51ac08bf535b48bbd1.zip
asterisk: mark as BROKEN and remove obsolete patch
Asterisk seems to have moved to a auto* build system, so the .mk has to be more or less completely rewritten.
-rw-r--r--package/multimedia/asterisk/Config.in4
-rw-r--r--package/multimedia/asterisk/asterisk_no_res_ninit.patch12
2 files changed, 1 insertions, 15 deletions
diff --git a/package/multimedia/asterisk/Config.in b/package/multimedia/asterisk/Config.in
index 581ec9112..47c1544fa 100644
--- a/package/multimedia/asterisk/Config.in
+++ b/package/multimedia/asterisk/Config.in
@@ -1,8 +1,6 @@
-comment "asterisk - is currently broken due to a bad patch"
- depends on BR2_PACKAGE_ASTERISK
-
config BR2_PACKAGE_ASTERISK
bool "asterisk"
+ depends on BROKEN
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_ZLIB
depends on BR2_PACKAGE_OPENSSL
diff --git a/package/multimedia/asterisk/asterisk_no_res_ninit.patch b/package/multimedia/asterisk/asterisk_no_res_ninit.patch
deleted file mode 100644
index 1dff2f305..000000000
--- a/package/multimedia/asterisk/asterisk_no_res_ninit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur /tmp/asterisk-1.2.0-beta1/dns.c asterisk-1.2.0-beta1/dns.c
---- /tmp/asterisk-1.2.0-beta1/dns.c 2005-08-14 04:23:33.000000000 +0200
-+++ asterisk-1.2.0-beta1/dns.c 2005-08-31 09:42:36.000000000 +0200
-@@ -157,7 +157,7 @@
- return 0;
- }
-
--#if defined(res_ninit)
-+#if (defined(res_ninit) && !defined(__UCLIBC__))
- #define HAS_RES_NINIT
- #else
- AST_MUTEX_DEFINE_STATIC(res_lock);