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

net/asterisk-13.x: bump to 13.17.0

Browse source 
- Version bump to 13.17.0
- Remove makeopts.embed_rules as the target got removed.
- Refresh patches.
- $(STAGING_DIR)/host doesn't work anymore resulting in libxml2 host
  headers not being found. Replace with $(STAGING_DIR_HOSTPGK).
- Prevent Asterisk from adding -march=native when cross-compiling (patch
  for configure.ac).

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-07-22 16:46:00 +02:00
parent 4774e211c7
commit 7e9c485725
5 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk13 PKG_NAME:=asterisk13
PKG_VERSION:=13.15.0 PKG_VERSION:=13.17.0
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_HASH:=8b8a55557d9c882f9b68f61b62f5f8af5c9ad68b6da6a1aa3506fa1894fb5844 PKG_HASH:=c4a89386d7db58520391fcbd3202902584b4434289094ca2e4a6b8dada1e90a4
PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libxml2/host PKG_BUILD_DEPENDS:=libxml2/host
@ -231,8 +231,8 @@ CONFIGURE_VARS += \
AST_MENUSELECT_OPTS = \ AST_MENUSELECT_OPTS = \
--without-newt \ --without-newt \
--without-curses \ --without-curses \
--with-ncurses="$(STAGING_DIR_HOST)/usr" \ --with-ncurses="$(STAGING_DIR_HOSTPKG)/usr" \
--with-libxml2="$(STAGING_DIR_HOST)/usr" --with-libxml2="$(STAGING_DIR_HOSTPKG)/usr"
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
@ -248,22 +248,22 @@ define Build/Configure
$(call Build/Configure/Default,,$(SITE_VARS)) $(call Build/Configure/Default,,$(SITE_VARS))
(cd $(PKG_BUILD_DIR)/menuselect; \ (cd $(PKG_BUILD_DIR)/menuselect; \
./bootstrap.sh; \ ./bootstrap.sh; \
ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR_HOSTPKG)/bin/xml2-config \
./configure \ ./configure \
$(HOST_CONFIGURE_ARGS) \ $(HOST_CONFIGURE_ARGS) \
$(AST_MENUSELECT_OPTS) \ $(AST_MENUSELECT_OPTS) \
LDFLAGS="$(HOST_LDFLAGS) -lxml2" \ LDFLAGS="$(HOST_LDFLAGS) -lxml2" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR)/host/include/libxml2" \ CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
); );
endef endef
define Build/Compile define Build/Compile
$(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" \ $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" \
CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR)/host/include/libxml2" \ CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOSTPKG)/include/libxml2" \
LDFLAGS="$(HOST_LDFLAGS) -lxml2" LDFLAGS="$(HOST_LDFLAGS) -lxml2"
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \
include/asterisk/version.h \ include/asterisk/version.h \
include/asterisk/buildopts.h defaults.h \ include/asterisk/buildopts.h defaults.h
makeopts.embed_rules
ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY"
ASTLDFLAGS="$(EXTRA_LDFLAGS)" ASTLDFLAGS="$(EXTRA_LDFLAGS)"
$(MAKE) -C "$(PKG_BUILD_DIR)" \ $(MAKE) -C "$(PKG_BUILD_DIR)" \

2
net/asterisk-13.x/patches/001-disable-semaphores-check.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -961,19 +961,6 @@ AC_LINK_IFELSE( @@ -962,19 +962,6 @@ AC_LINK_IFELSE(
] ]
) )

2
net/asterisk-13.x/patches/002-undef-res-ninit.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1291,7 +1291,6 @@ AC_LINK_IFELSE( @@ -1279,7 +1279,6 @@ AC_LINK_IFELSE(
#include <resolv.h>], #include <resolv.h>],
[int foo = res_ninit(NULL);])], [int foo = res_ninit(NULL);])],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)

6
net/asterisk-13.x/patches/052-musl-libcap.patch
View file

@ -26,12 +26,12 @@
AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220]) AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220])
--- a/main/Makefile --- a/main/Makefile
+++ b/main/Makefile +++ b/main/Makefile
@@ -47,7 +47,7 @@ AST_LIBS+=$(UUID_LIB) @@ -47,7 +47,7 @@ AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS)
AST_LIBS+=$(RT_LIB) AST_LIBS+=$(RT_LIB)
AST_LIBS+=$(SYSTEMD_LIB) AST_LIBS+=$(SYSTEMD_LIB)
-ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),) -ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
+ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-musl kfreebsd-gnu),) +ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-musl kfreebsd-gnu),)
ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
AST_LIBS+=-ldl AST_LIBS+=-ldl
endif ifneq (x$(CAP_LIB),x)
AST_LIBS+=$(CAP_LIB)

14
net/asterisk-13.x/patches/054-fix-cross-compile.patch Normal file
View file

@ -0,0 +1,14 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1226,7 +1226,10 @@ fi
AC_SUBST(AST_SHADOW_WARNINGS)
AC_MSG_CHECKING(for -march=native support)
-if $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+if test "${cross_compiling}" = "yes"; then
+ AC_MSG_RESULT(cross-compile)
+ AST_NATIVE_ARCH=0
+elif $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
AC_MSG_RESULT(yes)
AST_NATIVE_ARCH=1
else