From 220a96f9926788ed531717f78e44fdf1e7ab3b34 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Dec 2010 22:45:29 +0100 Subject: rework architecture / embedded systems concept Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;) --- package/asterisk/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'package/asterisk') diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 70baefbd9..bdf44fb96 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -16,7 +16,7 @@ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_MULTI:= 1 PKG_NOPARALLEL:= 1 -PKG_TARGET_DEPENDS:= !foxboard +PKG_ARCH_DEPENDS:= !cris PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS ASTERISK_CHAN_MGCP PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM @@ -57,9 +57,9 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+= asterisk-codec-gsm-install SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+= asterisk-pbx-dundi-install SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+= asterisk-res-agi-install -CONFIGURE_ARGS= --with-z=${STAGING_DIR}/usr \ - --with-ncurses=${STAGING_DIR}/usr \ - --with-ssl=${STAGING_DIR}/usr \ +CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ + --with-ncurses=${STAGING_TARGET_DIR}/usr \ + --with-ssl=${STAGING_TARGET_DIR}/usr \ --disable-xmldoc \ --without-tonezone \ --without-asound \ @@ -91,21 +91,21 @@ else CONFIGURE_ARGS+= --without-gsm endif ifneq (${ADK_PACKAGE_ASTERISK_CODEC_SPEEX},) -CONFIGURE_ARGS+= --with-speex=${STAGING_DIR}/usr -EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/speex +CONFIGURE_ARGS+= --with-speex=${STAGING_TARGET_DIR}/usr +EXTRA_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/speex endif ifneq (${ADK_PACKAGE_ASTERISK_FORMAT_VORBIS},) -CONFIGURE_ARGS+= --with-ogg=${STAGING_DIR}/usr \ - --with-vorbis=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-ogg=${STAGING_TARGET_DIR}/usr \ + --with-vorbis=${STAGING_TARGET_DIR}/usr TLDFLAGS+= -logg endif ifneq (${ADK_PACKAGE_ASTERISK_CURL},) -CONFIGURE_ARGS+= --with-libcurl=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-libcurl=${STAGING_TARGET_DIR}/usr else CONFIGURE_ARGS+= --without-libcurl endif ifneq (${ADK_PACKAGE_ASTERISK_PGSQL},) -CONFIGURE_ARGS+= --with-postgres=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-postgres=${STAGING_TARGET_DIR}/usr else CONFIGURE_ARGS+= --without-postgres endif -- cgit v1.2.3