package/asterisk: disable spandsp
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Wed, 4 Nov 2020 17:34:01 +0000 (18:34 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Wed, 4 Nov 2020 19:30:33 +0000 (20:30 +0100)
asterisk fails to build with spandsp since commit 36c983bfa543de89a
(package/spandsp: bump version to 3.0.0), so disable it.

Fixes:
 - http://autobuild.buildroot.org/results/c984738cad4186edb12a62b8e74115e68efe35f0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/asterisk/asterisk.mk

index eb72104d9a52113da6154e501fd0cadbb918a79c..b9e2b80dd5bdb7d04e21c0fd46dc61f1cb6ae1c1 100644 (file)
@@ -107,6 +107,9 @@ ASTERISK_CONF_OPTS = \
 # the time of this writing).
 ASTERISK_CONF_OPTS += --without-avcodec
 
+# asterisk is not compatible with freeswitch spandsp
+ASTERISK_CONF_OPTS += --without-spandsp
+
 ASTERISK_CONF_ENV = \
        ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true \
        ac_cv_path_CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config
@@ -232,13 +235,6 @@ else
 ASTERISK_CONF_OPTS += --without-ssl
 endif
 
-ifeq ($(BR2_PACKAGE_SPANDSP),y)
-ASTERISK_DEPENDENCIES += spandsp
-ASTERISK_CONF_OPTS += --with-spandsp
-else
-ASTERISK_CONF_OPTS += --without-spandsp
-endif
-
 ifeq ($(BR2_PACKAGE_SPEEX)$(BR2_PACKAGE_SPEEXDSP),yy)
 ASTERISK_DEPENDENCIES += speex
 ASTERISK_CONF_OPTS += --with-speex --with-speexdsp