From 2184038734019ba5bd513575032b6bb4d3e74820 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 9 Mar 2018 12:40:07 +0100 Subject: [PATCH] asterisk-13.x: update compile stage - define Build/menuselect for reuse - call the default Compile define for menuselect-tree Signed-off-by: Sebastian Kemper --- net/asterisk-13.x/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index cc0880f..fbfd69d 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -372,6 +372,13 @@ AST_MENUSELECT_OPTS = \ --without-curses \ --with-libxml2="$(STAGING_DIR_HOSTPKG)/usr" +define Build/menuselect + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \ + LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \ + $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" +endef + define Build/Configure cd $(PKG_BUILD_DIR); \ ./bootstrap.sh @@ -389,11 +396,9 @@ define Build/Configure endef define Build/Compile - CC="$(HOSTCC)" \ - CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \ - $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" - $(MAKE) -C "$(PKG_BUILD_DIR)" menuselect-tree + $(call Build/menuselect) + $(call Build/Compile/Default,menuselect-tree) + cd "$(PKG_BUILD_DIR)" && MENUSELECT_ARGS= && \ for cat in $(MENUSELECT_CATEGORIES); do \ MENUSELECT_ARGS="$$$$MENUSELECT_ARGS --disable-category $$$$cat"; \ -- 2.30.2