merge of '444297a3111a94b97335747038fe18af35d24735'

     and '54b1077143d5e39c27829e8ac9f7ce627a908844'

1 files changed, 38 insertions, 12 deletions

diff --git a/packages/asterisk/asterisk_1.4.10.bb b/packages/asterisk/asterisk_1.4.10.bb
index e3f7db2f71..4110f01930 100644
--- a/packages/asterisk/asterisk_1.4.10.bb
+++ b/packages/asterisk/asterisk_1.4.10.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.asterisk.org"
 SECTION = "voip"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
-DEPENDS = "speex ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
+SECTION = "console/telephony"
+DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 RRECOMMENDS_${PN} = "logrotate"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -15,23 +17,30 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
 	file://volatiles \
 	file://init"
 
+ARCH_efika="ppc"
+ARCH_dht-walnut="ppc"
+ARCH_magicbox="ppc"
+ARCH_sequoia="ppc"
+
+
+
 
 INITSCRIPT_NAME = "asterisk"
 INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${HOST_SYS}\
-			--with-z=${STAGING_DIR}/${HOST_SYS}\
-			--with-curl=${STAGING_DIR}/${HOST_SYS}\
-			--with-termcap=${STAGING_DIR}/${HOST_SYS}\
-			--with-ogg=${STAGING_DIR}/${HOST_SYS}\
-			--with-vorbis=${STAGING_DIR}/${HOST_SYS}\
-			--with-sqlite=${STAGING_DIR}/${HOST_SYS}\
-			--with-popt=${STAGING_DIR}/${HOST_SYS}\
-			--with-gnutls=${STAGING_DIR}/${HOST_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
+			--with-z=${STAGING_DIR}/${TARGET_SYS}\
+			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
+			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
+			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
+			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
+			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
+			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${HOST_SYS}\
+			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
@@ -48,6 +57,7 @@ EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${HOST_SYS}\
 
 export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096"
 export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv "
+export PROC="${ARCH}"
 
 do_configure_prepend () {
 	sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate
@@ -63,6 +73,22 @@ do_configure () {
 	oe_runconf
 }
 
+
+do_compile() {
+        (
+         #make sure that menuselect gets build using host toolchain
+         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+         cd menuselect 
+         ./configure
+         oe_runmake
+         cd ../
+        ) || exit 1
+        oe_runmake
+}
+
+
+
+
 do_install_append() {
         install -d ${D}${sysconfdir}/init.d/
 	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk
@@ -142,4 +168,4 @@ CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf"
 CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf"
 CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf"
 CONFFILES_${PN} += "${sysconfdir}/asterisk/zapata.conf"
-
+CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk"