asterisk11: clean up configure stage

- Remove some unneeded parentheses.
- Use CONFIGURE_VARS instead of SITE_VARS.
- Clean up user.mak input, add NDEBUG=1 to avoid debug asserts.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile
index fc907f2ac3552be0bc82c199a86add3b990e5dbd..64ca39afe20e53f1043f3ec962926821df4d702e 100644 (file)
--- a/net/asterisk-11.x/Makefile
+++ b/net/asterisk-11.x/Makefile
@@ -234,7 +234,7 @@ endif
 ifneq ($(CONFIG_PACKAGE_asterisk11-res-xmpp),)
   CONFIGURE_ARGS+= \
        --with-iksemel="$(STAGING_DIR)/usr"
-  SITE_VARS+= \
+  CONFIGURE_VARS+= \
        ac_cv_lib_iksemel_iks_start_sasl=yes
 else
   CONFIGURE_ARGS+= \
@@ -298,20 +298,14 @@ endif
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); \
-               ./bootstrap.sh; \
-       );
-       echo "export CFLAGS += $(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS)"\
-               " $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\
-               > $(PKG_BUILD_DIR)/res/pjproject/user.mak;
-       echo "export LDLAGS += $(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"\
-               " -lc $(LIBGCC_S) -lm"\
-               >> $(PKG_BUILD_DIR)/res/pjproject/user.mak;
-       echo "export CXXFLAGS += $(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS)"\
-               " $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\
-               >> $(PKG_BUILD_DIR)/res/pjproject/user.mak;
-       $(call Build/Configure/Default,,$(SITE_VARS))
-       (cd $(PKG_BUILD_DIR)/menuselect; \
+       cd $(PKG_BUILD_DIR); \
+               ./bootstrap.sh
+       echo "export CFLAGS=-DNDEBUG=1 $(FPIC) $(TARGET_CFLAGS)" \
+               > $(PKG_BUILD_DIR)/res/pjproject/user.mak
+       echo "export LDFLAGS=$(TARGET_LDFLAGS)" \
+               >> $(PKG_BUILD_DIR)/res/pjproject/user.mak
+       $(call Build/Configure/Default)
+       cd $(PKG_BUILD_DIR)/menuselect; \
                CC="$(HOSTCC)" \
                CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
                CONFIG_SITE= \
@@ -319,8 +313,7 @@ define Build/Configure
                ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
                ./configure \
                $(HOST_CONFIGURE_ARGS) \
-               $(AST_MENUSELECT_OPTS) \
-       );
+               $(AST_MENUSELECT_OPTS)
 endef
 
 define Build/Compile