summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-06-12 18:23:46 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-12 18:23:46 +0000
commit979cab34e7007b68e5da46a5e79485ac1797d10e (patch)
tree6e0420f41341be6763d4f364913b9ae9da89b963
parent017b42a2a426c816780af98c28b30d3bfb3c67e6 (diff)
parent8a4ac051f2d6764d53f4f7674e9a7bb6f7f59d69 (diff)
merge of fb53c03fb636482fe26316e5adacbaeb4ddd5634
and c2029c080c2c9d3dc9675ff97d1ff45df7c5fd08
-rw-r--r--packages/asterisk/asterisk-1.2.9.1/asterisk.patch9
-rw-r--r--packages/asterisk/asterisk_1.2.9.1.bb4
2 files changed, 11 insertions, 2 deletions
diff --git a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
index 4f65938a11..9e93f9d5d7 100644
--- a/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
+++ b/packages/asterisk/asterisk-1.2.9.1/asterisk.patch
@@ -210,3 +210,12 @@
TARGET+=astman
endif
+@@ -64,7 +64,7 @@
+ $(CC) $(CFLAGS) -o $@ $^
+
+ smsq: smsq.o
+- $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt
++ $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(LDFLAGS)
+
+ streamplayer: streamplayer.o
+ $(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o ${SOLLIBS}
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb
index 4a57b8e71f..b08e178388 100644
--- a/packages/asterisk/asterisk_1.2.9.1.bb
+++ b/packages/asterisk/asterisk_1.2.9.1.bb
@@ -1,8 +1,8 @@
DESCRIPTION="The Asterisk open source software PBX"
HOMEPAGE="www.asterisk.org"
LICENSE="GPL"
-DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis"
-PR = "r3"
+DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt"
+PR = "r4"
SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
file://asterisk.patch;patch=1"