asterisk-15.x: update compile stage
- define Build/menuselect for reuse - call the default Compile define for menuselect-tree Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
parent
8510c786c0
commit
dc40ee03e4
1 changed files with 10 additions and 5 deletions
|
@ -379,6 +379,13 @@ AST_MENUSELECT_OPTS = \
|
||||||
--without-curses \
|
--without-curses \
|
||||||
--with-libxml2="$(STAGING_DIR_HOSTPKG)/usr"
|
--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
|
define Build/Configure
|
||||||
cd $(PKG_BUILD_DIR); \
|
cd $(PKG_BUILD_DIR); \
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
|
@ -396,11 +403,9 @@ define Build/Configure
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
CC="$(HOSTCC)" \
|
$(call Build/menuselect)
|
||||||
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
|
$(call Build/Compile/Default,menuselect-tree)
|
||||||
LDFLAGS="$(HOST_LDFLAGS) -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib" \
|
|
||||||
$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
|
|
||||||
$(MAKE) -C "$(PKG_BUILD_DIR)" menuselect-tree
|
|
||||||
cd "$(PKG_BUILD_DIR)" && MENUSELECT_ARGS= && \
|
cd "$(PKG_BUILD_DIR)" && MENUSELECT_ARGS= && \
|
||||||
for cat in $(MENUSELECT_CATEGORIES); do \
|
for cat in $(MENUSELECT_CATEGORIES); do \
|
||||||
MENUSELECT_ARGS="$$$$MENUSELECT_ARGS --disable-category $$$$cat"; \
|
MENUSELECT_ARGS="$$$$MENUSELECT_ARGS --disable-category $$$$cat"; \
|
||||||
|
|
Loading…
Reference in a new issue