From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Fri, 28 Jul 2017 19:29:10 +0000 (+0200)
Subject: net/asterisk-11.x and net/asterisk-13.x: remove $(SDK) from ifneqs
X-Git-Url: http://git.openwrt.org/?p=feed%2Ftelephony.git;a=commitdiff_plain;h=5cb478e3af94d30fe74561caf1335ab00f8c6504

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

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>
---

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index 4f9cd66..2bfadbf 100644
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -164,7 +164,7 @@ define Package/asterisk11-sounds/install
 	rm -f $(1)/usr/lib/asterisk/sounds/conf-*
 endef
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-chan-dahdi),)
+ifneq ($(CONFIG_PACKAGE_asterisk11-chan-dahdi),)
   CONFIGURE_ARGS+= \
 	--with-dahdi="$(STAGING_DIR)/usr" \
 	--with-pri="$(STAGING_DIR)/usr" \
@@ -176,7 +176,7 @@ else
 	--without-tonezone
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-curl),)
+ifneq ($(CONFIG_PACKAGE_asterisk11-curl),)
   CONFIGURE_ARGS+= \
 	--with-libcurl="$(STAGING_DIR)/usr"
 else
@@ -184,7 +184,7 @@ else
 	--without-libcurl
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-mysql),)
+ifneq ($(CONFIG_PACKAGE_asterisk11-mysql),)
   CONFIGURE_VARS+= \
 	ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT=$(STAGING_DIR)/usr/bin/mysql_config
   CONFIGURE_ARGS+= \
@@ -194,7 +194,7 @@ else
 	--without-mysqlclient
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-pbx-lua),)
+ifneq ($(CONFIG_PACKAGE_asterisk11-pbx-lua),)
   CONFIGURE_ARGS+= \
 	--with-lua="$(STAGING_DIR)/usr"
   TARGET_LDFLAGS+=-ldl -lcrypt
@@ -203,7 +203,7 @@ else
 	--without-lua
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-pgsql),)
+ifneq ($(CONFIG_PACKAGE_asterisk11-pgsql),)
   CONFIGURE_ARGS+= \
 	--with-postgres="$(STAGING_DIR)/usr"
 else
@@ -211,7 +211,7 @@ else
 	--without-postgres
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-fax-spandsp),)
+ifneq ($(CONFIG_PACKAGE_asterisk11-res-fax-spandsp),)
   CONFIGURE_ARGS+= \
 	--with-spandsp="$(STAGING_DIR)/usr"
 else
@@ -219,7 +219,7 @@ else
 	--without-spandsp
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-srtp),)
+ifneq ($(CONFIG_PACKAGE_asterisk11-res-srtp),)
   CONFIGURE_ARGS+= \
 	--with-srtp="$(STAGING_DIR)/usr"
 else
@@ -227,7 +227,7 @@ else
 	--without-srtp
 endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-xmpp),)
+ifneq ($(CONFIG_PACKAGE_asterisk11-res-xmpp),)
   CONFIGURE_ARGS+= \
 	--with-iksemel="$(STAGING_DIR)/usr"
   SITE_VARS+= \
diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index 5d53d6d..d082d66 100644
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -165,7 +165,7 @@ define Package/asterisk13-sounds/install
 	rm -f $(1)/usr/lib/asterisk/sounds/vm-*
 endef
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk13-chan-dahdi),)
+ifneq ($(CONFIG_PACKAGE_asterisk13-chan-dahdi),)
   CONFIGURE_ARGS+= \
 	--with-dahdi="$(STAGING_DIR)/usr" \
 	--with-pri="$(STAGING_DIR)/usr" \