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

asterisk11: clean up configure stage

Browse source 
- 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>
This commit is contained in:
Sebastian Kemper 2017-09-10 22:11:36 +02:00
parent 203301581c
commit 3dd0dfe492
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -234,7 +234,7 @@ endif
ifneq ($(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+= \ CONFIGURE_VARS+= \
ac_cv_lib_iksemel_iks_start_sasl=yes ac_cv_lib_iksemel_iks_start_sasl=yes
else else
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
@ -298,20 +298,14 @@ endif
endef endef
define Build/Configure define Build/Configure
(cd $(PKG_BUILD_DIR); \ cd $(PKG_BUILD_DIR); \
./bootstrap.sh; \ ./bootstrap.sh
); echo "export CFLAGS=-DNDEBUG=1 $(FPIC) $(TARGET_CFLAGS)" \
echo "export CFLAGS += $(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS)"\ > $(PKG_BUILD_DIR)/res/pjproject/user.mak
" $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\ echo "export LDFLAGS=$(TARGET_LDFLAGS)" \
> $(PKG_BUILD_DIR)/res/pjproject/user.mak; >> $(PKG_BUILD_DIR)/res/pjproject/user.mak
echo "export LDLAGS += $(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"\ $(call Build/Configure/Default)
" -lc $(LIBGCC_S) -lm"\ cd $(PKG_BUILD_DIR)/menuselect; \
>> $(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; \
CC="$(HOSTCC)" \ CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \ CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
CONFIG_SITE= \ CONFIG_SITE= \
@ -319,8 +313,7 @@ define Build/Configure
ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \ ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
./configure \ ./configure \
$(HOST_CONFIGURE_ARGS) \ $(HOST_CONFIGURE_ARGS) \
$(AST_MENUSELECT_OPTS) \ $(AST_MENUSELECT_OPTS)
);
endef endef
define Build/Compile define Build/Compile