projects
/
feed
/
telephony.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/asterisk-11.x and net/asterisk-13.x: fix menuselect build
[feed/telephony.git]
/
net
/
asterisk-11.x
/
Makefile
diff --git
a/net/asterisk-11.x/Makefile
b/net/asterisk-11.x/Makefile
index 12d8a04fe02c3e35565c5d63a7a3832ac7e466e9..baff718aa0fa831cea86d553af9e4ff20823b4ae 100644
(file)
--- a/
net/asterisk-11.x/Makefile
+++ b/
net/asterisk-11.x/Makefile
@@
-24,6
+24,7
@@
PKG_LICENSE_FILES:=COPYING LICENSE
PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
include $(INCLUDE_DIR)/package.mk
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
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 \
AST_MENUSELECT_OPTS = \
--without-newt \
--without-curses \
- --with-ncurses="$(STAGING_DIR_HOSTPKG)/usr" \
--with-libxml2="$(STAGING_DIR_HOSTPKG)/usr"
define Build/Prepare
--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; \
>> $(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) \
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
);
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
$(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \
include/asterisk/buildopts.h defaults.h \
makeopts.embed_rules