Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asterisk-15.x: fix CONFIGURE_ARGS

Browse source 
The way CONFIGURE_ARGS are done for srtp and pjproect does not take into
account that more than one package depends on them. This can result in
build failures. So add ifeqs to test properly if --with or --without is
required.

This commit also adds CONFIGURE_ARGS checks for:

alsa (asound)
portaudio
speex
speexdsp

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-12-05 20:53:47 +01:00
parent 78d4dc4ff0
commit fb84fe64e3
1 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
net/asterisk-15.x/Makefile
View file

@ -240,6 +240,7 @@ endif
TARGET_CFLAGS+=$(TARGET_CPPFLAGS) TARGET_CFLAGS+=$(TARGET_CPPFLAGS)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-chan-alsa),--with-asound="$(STAGING_DIR)/usr",--without-asound) \
--without-execinfo \ --without-execinfo \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-chan-mobile),--with-bluetooth="$(STAGING_DIR)/usr",--without-bluetooth) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-chan-mobile),--with-bluetooth="$(STAGING_DIR)/usr",--without-bluetooth) \
--with-cap="$(STAGING_DIR)/usr" \ --with-cap="$(STAGING_DIR)/usr" \
@ -251,7 +252,6 @@ CONFIGURE_ARGS+= \
--without-isdnnet \ --without-isdnnet \
--without-misdn \ --without-misdn \
--without-nbs \ --without-nbs \
--with-pjproject="$(STAGING_DIR)/usr" \
--without-pjproject-bundled \ --without-pjproject-bundled \
--with-libedit="$(STAGING_DIR)/usr" \ --with-libedit="$(STAGING_DIR)/usr" \
--with-libxml2 \ --with-libxml2 \
@ -261,15 +261,14 @@ CONFIGURE_ARGS+= \
--without-osptk \ --without-osptk \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-pbx-lua),--with-lua="$(STAGING_DIR)/usr",--without-lua) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-pbx-lua),--with-lua="$(STAGING_DIR)/usr",--without-lua) \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-pgsql),--with-postgres="$(STAGING_DIR)/usr",--without-postgres) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-pgsql),--with-postgres="$(STAGING_DIR)/usr",--without-postgres) \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-pjsip),--with-pjproject="$(STAGING_DIR)/usr",--without-pjproject) \
--with-popt="$(STAGING_DIR)/usr" \ --with-popt="$(STAGING_DIR)/usr" \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-chan-console),--with-portaudio="$(STAGING_DIR)/usr",--without-portaudio) \
--without-pwlib \ --without-pwlib \
--without-radius \ --without-radius \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-fax-spandsp),--with-spandsp="$(STAGING_DIR)/usr",--without-spandsp) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-fax-spandsp),--with-spandsp="$(STAGING_DIR)/usr",--without-spandsp) \
--without-sdl \ --without-sdl \
--without-sqlite \ --without-sqlite \
--with-sqlite3="$(STAGING_DIR)/usr" \ --with-sqlite3="$(STAGING_DIR)/usr" \
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-srtp),--with-srtp="$(STAGING_DIR)/usr",--without-srtp) \
--without-suppserv \ --without-suppserv \
--without-tds \ --without-tds \
--without-termcap \ --without-termcap \
@ -281,6 +280,22 @@ CONFIGURE_ARGS+= \
--with-sounds-cache="$(DL_DIR)" \ --with-sounds-cache="$(DL_DIR)" \
--enable-xmldoc --enable-xmldoc
ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-codec-speex)$(CONFIG_PACKAGE_$(PKG_NAME)-format-ogg-speex)$(CONFIG_PACKAGE_$(PKG_NAME)-func-speex),)
CONFIGURE_ARGS+= \
--without-speex
else
CONFIGURE_ARGS+= \
--with-speex="$(STAGING_DIR)/usr"
endif
ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-codec-speex)$(CONFIG_PACKAGE_$(PKG_NAME)-func-speex),)
CONFIGURE_ARGS+= \
--without-speexdsp
else
CONFIGURE_ARGS+= \
--with-speexdsp="$(STAGING_DIR)/usr"
endif
ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-format-ogg-speex)$(CONFIG_PACKAGE_$(PKG_NAME)-format-ogg-vorbis),) ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-format-ogg-speex)$(CONFIG_PACKAGE_$(PKG_NAME)-format-ogg-vorbis),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--without-ogg --without-ogg
@ -289,6 +304,22 @@ CONFIGURE_ARGS+= \
--with-ogg="$(STAGING_DIR)/usr" --with-ogg="$(STAGING_DIR)/usr"
endif endif
ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-res-pjproject)$(CONFIG_PACKAGE_$(PKG_NAME)-res-srtp),)
CONFIGURE_ARGS+= \
--without-srtp
else
CONFIGURE_ARGS+= \
--with-srtp="$(STAGING_DIR)/usr"
endif
ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-pjsip)$(CONFIG_PACKAGE_$(PKG_NAME)-res-pjproject)$(CONFIG_PACKAGE_$(PKG_NAME)-res-rtp-asterisk)$(CONFIG_PACKAGE_$(PKG_NAME)-res-sdp-translator-pjmedia),)
CONFIGURE_ARGS+= \
--without-pjproject
else
CONFIGURE_ARGS+= \
--with-pjproject="$(STAGING_DIR)/usr"
endif
# res-calendar-ews requires both neon and neon29 detection # res-calendar-ews requires both neon and neon29 detection
ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-res-calendar-caldav)$(CONFIG_PACKAGE_$(PKG_NAME)-res-calendar-ews)$(CONFIG_PACKAGE_$(PKG_NAME)-res-calendar-exchange)$(CONFIG_PACKAGE_$(PKG_NAME)-res-calendar-icalendar),) ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-res-calendar-caldav)$(CONFIG_PACKAGE_$(PKG_NAME)-res-calendar-ews)$(CONFIG_PACKAGE_$(PKG_NAME)-res-calendar-exchange)$(CONFIG_PACKAGE_$(PKG_NAME)-res-calendar-icalendar),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \