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

net/asterisk-11.x and net/asterisk-13.x: remove $(SDK) from ifneqs

Browse source 
The variable prevents the ifneqs from working on the buildbots. $(SDK)
is set there, so the ifneqs that test for empty will always be true.

libpq for instance doesn't build on aarch64. So the asterisk pgsql
package has a dependency on @!aarch64. An ifneq is used to disable libpq
detection by the configure script, to prevent the build to fail. But
because of $(SDK) being set the ifneq is always true, so libpq detection
is enabled, causing the build to always fail.

There are only two other packages in the tree that actually use the
$(SDK) variable, so it's fair to assume it's not needed for the asterisk
packages and can just be dropped.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-07-28 21:29:10 +02:00
parent c21d41bb00
commit 5cb478e3af
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/asterisk-11.x/Makefile
View file

@ -164,7 +164,7 @@ define Package/asterisk11-sounds/install
rm -f $(1)/usr/lib/asterisk/sounds/conf-* rm -f $(1)/usr/lib/asterisk/sounds/conf-*
endef endef
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-chan-dahdi),) ifneq ($(CONFIG_PACKAGE_asterisk11-chan-dahdi),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-dahdi="$(STAGING_DIR)/usr" \ --with-dahdi="$(STAGING_DIR)/usr" \
--with-pri="$(STAGING_DIR)/usr" \ --with-pri="$(STAGING_DIR)/usr" \
@ -176,7 +176,7 @@ else
--without-tonezone --without-tonezone
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-curl),) ifneq ($(CONFIG_PACKAGE_asterisk11-curl),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-libcurl="$(STAGING_DIR)/usr" --with-libcurl="$(STAGING_DIR)/usr"
else else
@ -184,7 +184,7 @@ else
--without-libcurl --without-libcurl
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-mysql),) ifneq ($(CONFIG_PACKAGE_asterisk11-mysql),)
CONFIGURE_VARS+= \ CONFIGURE_VARS+= \
ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT=$(STAGING_DIR)/usr/bin/mysql_config ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT=$(STAGING_DIR)/usr/bin/mysql_config
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
@ -194,7 +194,7 @@ else
--without-mysqlclient --without-mysqlclient
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-pbx-lua),) ifneq ($(CONFIG_PACKAGE_asterisk11-pbx-lua),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-lua="$(STAGING_DIR)/usr" --with-lua="$(STAGING_DIR)/usr"
TARGET_LDFLAGS+=-ldl -lcrypt TARGET_LDFLAGS+=-ldl -lcrypt
@ -203,7 +203,7 @@ else
--without-lua --without-lua
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-pgsql),) ifneq ($(CONFIG_PACKAGE_asterisk11-pgsql),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-postgres="$(STAGING_DIR)/usr" --with-postgres="$(STAGING_DIR)/usr"
else else
@ -211,7 +211,7 @@ else
--without-postgres --without-postgres
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-fax-spandsp),) ifneq ($(CONFIG_PACKAGE_asterisk11-res-fax-spandsp),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-spandsp="$(STAGING_DIR)/usr" --with-spandsp="$(STAGING_DIR)/usr"
else else
@ -219,7 +219,7 @@ else
--without-spandsp --without-spandsp
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-srtp),) ifneq ($(CONFIG_PACKAGE_asterisk11-res-srtp),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-srtp="$(STAGING_DIR)/usr" --with-srtp="$(STAGING_DIR)/usr"
else else
@ -227,7 +227,7 @@ else
--without-srtp --without-srtp
endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-xmpp),) ifneq ($(CONFIG_PACKAGE_asterisk11-res-xmpp),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-iksemel="$(STAGING_DIR)/usr" --with-iksemel="$(STAGING_DIR)/usr"
SITE_VARS+= \ SITE_VARS+= \

2
net/asterisk-13.x/Makefile
View file

@ -165,7 +165,7 @@ define Package/asterisk13-sounds/install
rm -f $(1)/usr/lib/asterisk/sounds/vm-* rm -f $(1)/usr/lib/asterisk/sounds/vm-*
endef endef
ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk13-chan-dahdi),) ifneq ($(CONFIG_PACKAGE_asterisk13-chan-dahdi),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-dahdi="$(STAGING_DIR)/usr" \ --with-dahdi="$(STAGING_DIR)/usr" \
--with-pri="$(STAGING_DIR)/usr" \ --with-pri="$(STAGING_DIR)/usr" \