From: Sebastian Kemper Date: Sun, 4 Mar 2018 17:25:11 +0000 (+0100) Subject: freeswitch-stable: move module selection to Build/Configure X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee3add9b9c5d564e98ff8459a3813d9c4f9819a1;p=feed%2Ftelephony.git freeswitch-stable: move module selection to Build/Configure Currently the routine that sets up the modules.conf file resides in Build/Prepare. When PKG_CONFIG_DEPENDS causes a reconfiguration, Build/Prepare is not triggered. So if another module gets selected in menuconfig, this module would not be added to modules.conf, meaning the rebuild would fail. Add the routine to Build/Compile to address this. Signed-off-by: Sebastian Kemper --- diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index d62740b..97c8219 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -949,14 +949,17 @@ define Build/Prepare echo '#applications/mod_random' >> $(PKG_BUILD_DIR)/modules.conf echo '#codecs/mod_yuv' >> $(PKG_BUILD_DIR)/modules.conf echo '#event_handlers/mod_event_test' >> $(PKG_BUILD_DIR)/modules.conf + + $(SED) 's|$(FS_STABLE_ANCHOR)|APR_SETVAR(LDFLAGS,$(FS_STABLE_APR_LIBS) $(TARGET_LDFLAGS))|' \ + $(PKG_BUILD_DIR)/libs/unimrcp/build/acmacros/apr.m4 +endef + +define Build/Configure $(SED) '/^#/!s/^/#/' $(PKG_BUILD_DIR)/modules.conf $(foreach m,$(FS_STABLE_MOD_AVAILABLE), $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)), $(SED) '/mod_$(m)$$$$/s/^#//' $(PKG_BUILD_DIR)/modules.conf)) - $(SED) 's|$(FS_STABLE_ANCHOR)|APR_SETVAR(LDFLAGS,$(FS_STABLE_APR_LIBS) $(TARGET_LDFLAGS))|' \ - $(PKG_BUILD_DIR)/libs/unimrcp/build/acmacros/apr.m4 - # Hack for misc-grammar - needs mod_pocketsphinx to provide grammar files ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-grammar),) ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-pocketsphinx),) @@ -977,6 +980,8 @@ ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-sofia),) $(SED) '/mod_sofia$$$$/s/^#//' $(PKG_BUILD_DIR)/modules.conf endif endif + + $(call Build/Configure/Default) endef define Build/Compile