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

net/asterisk-11.x and net/asterisk-13.x: fix menuselect build

Browse source 
- Include host-build.mk, otherwise $HOST_CONFIGURE_ARGS will be empty.
- Remove --with-ncurses=PATH as the PATH is wrong. The ncurses host
  package does not install anything but 'tic'.
- Use $HOSTCC to compile menuselect. This has the added bonus of using
  ccache (if selected).
- Run configure with an unset $CONFIG_SITE so that it doesn't pick a
  cross-compile site-script, e.g. for mips.
- Drop '-lxml2' from $LDFLAGS as the menuselect Makefile will add it
  anyway.
- Move the variables in front of 'make' as they're not arguments.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-07-24 23:31:06 +02:00
parent 8dce744b5d
commit db6a13f8a0
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ PKG_LICENSE_FILES:=COPYING LICENSE
PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/asterisk11/install/module
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
@ -282,7 +283,6 @@ CONFIGURE_VARS += \
AST_MENUSELECT_OPTS = \
--without-newt \
--without-curses \
--with-ncurses="$(STAGING_DIR_HOSTPKG)/usr" \
--with-libxml2="$(STAGING_DIR_HOSTPKG)/usr"
define Build/Prepare
@ -307,19 +307,22 @@ define Build/Configure
>> $(PKG_BUILD_DIR)/res/pjproject/user.mak;
$(call Build/Configure/Default,,$(SITE_VARS))
(cd $(PKG_BUILD_DIR)/menuselect; \
CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
CONFIG_SITE= \
LDFLAGS="$(HOST_LDFLAGS)" \
ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
./configure \
$(HOST_CONFIGURE_ARGS) \
$(AST_MENUSELECT_OPTS) \
LDFLAGS="$(HOST_LDFLAGS) -lxml2" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
);
endef
define Build/Compile
$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
LDFLAGS="$(HOST_LDFLAGS) -lxml2"
CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
LDFLAGS="$(HOST_LDFLAGS)" \
$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
$(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \
include/asterisk/buildopts.h defaults.h \
makeopts.embed_rules

15
net/asterisk-13.x/Makefile
View file

@ -25,6 +25,7 @@ PKG_LICENSE_FILES:=COPYING LICENSE
PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/asterisk13/install/module
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
@ -231,7 +232,6 @@ CONFIGURE_VARS += \
AST_MENUSELECT_OPTS = \
--without-newt \
--without-curses \
--with-ncurses="$(STAGING_DIR_HOSTPKG)/usr" \
--with-libxml2="$(STAGING_DIR_HOSTPKG)/usr"
define Build/Prepare
@ -248,19 +248,22 @@ define Build/Configure
$(call Build/Configure/Default,,$(SITE_VARS))
(cd $(PKG_BUILD_DIR)/menuselect; \
./bootstrap.sh; \
CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
CONFIG_SITE= \
LDFLAGS="$(HOST_LDFLAGS)" \
ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
./configure \
$(HOST_CONFIGURE_ARGS) \
$(AST_MENUSELECT_OPTS) \
LDFLAGS="$(HOST_LDFLAGS) -lxml2" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
);
endef
define Build/Compile
$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
LDFLAGS="$(HOST_LDFLAGS) -lxml2"
CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
LDFLAGS="$(HOST_LDFLAGS)" \
$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect"
$(MAKE) -C "$(PKG_BUILD_DIR)" \
include/asterisk/version.h \
include/asterisk/buildopts.h defaults.h