asterisk-11.x: update to 11.18.0

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2015-06-19 04:42:39 +02:00
parent 2d319d0063
commit 8885c6784c
4 changed files with 8 additions and 19 deletions

View file

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk11
PKG_VERSION:=11.17.1
PKG_VERSION:=11.18.0
PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_MD5SUM:=2c6cd0f499152d0d5ff32f36e274fc2e
PKG_MD5SUM:=3ddb42b54db200faccd68906df210a40
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING LICENSE
@ -289,13 +289,13 @@ define Build/Configure
endef
define Build/Compile
$(MAKE) -C "$(PKG_BUILD_DIR)" \
( retry=""; while [ ! "$$$$retry" ] && ! $(MAKE) -C "$(PKG_BUILD_DIR)" \
include/asterisk/version.h \
include/asterisk/buildopts.h defaults.h \
makeopts.embed_rules
makeopts.embed_rules; do retry=1; done )
ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY"
ASTLDFLAGS="$(EXTRA_LDFLAGS)"
$(MAKE) -C "$(PKG_BUILD_DIR)" \
( retry=""; while [ ! "$$$$retry" ] && ! $(MAKE) -C "$(PKG_BUILD_DIR)" \
ASTVARLIBDIR="/usr/lib/asterisk" \
ASTDATADIR="/usr/lib/asterisk" \
ASTKEYDIR="/usr/lib/asterisk" \
@ -304,7 +304,7 @@ define Build/Compile
DEBUG="" \
OPTIMIZE="" \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install samples
all install samples; do retry=1; done )
endef
define Build/InstallDev

View file

@ -1,6 +1,6 @@
--- a/res/Makefile
+++ b/res/Makefile
@@ -75,7 +75,7 @@ dist-clean::
@@ -78,7 +78,7 @@ distclean::
rm -f pjproject/build.mak
pjproject/build.mak: pjproject/aconfigure

View file

@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -16533,7 +16533,6 @@ if ac_fn_c_try_link "$LINENO"; then :
@@ -16606,7 +16606,6 @@ if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }

View file

@ -1,11 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -901,7 +901,7 @@ nmenuselect: menuselect/nmenuselect menu
-@menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
# options for make in menuselect/
-MAKE_MENUSELECT=CC="$(CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \
+MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \
CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
$(MAKE) -C menuselect CONFIGURE_SILENT="--silent"