diff options
| author | Jiri Slachta | 2017-08-15 15:28:05 +0000 |
|---|---|---|
| committer | GitHub | 2017-08-15 15:28:05 +0000 |
| commit | c6493b543a26df0838b9887e16f42d93c9f2f2c7 (patch) | |
| tree | 3a9b437a632920bca7b97c2431140c2bf183709e | |
| parent | 921a560832fd1098f533dfdacece2133ea369e57 (diff) | |
| parent | d1ab4dac16eb1f6bc098e8f9854c857634942f37 (diff) | |
| download | telephony-c6493b543a26df0838b9887e16f42d93c9f2f2c7.tar.gz | |
Merge pull request #180 from micmac1/master
chan-sccp-b: switch to git version, update patch
| -rw-r--r-- | net/chan-sccp-b/Makefile | 18 | ||||
| -rw-r--r-- | net/chan-sccp-b/patches/01-drop-Og-optimization.patch | 11 | ||||
| -rw-r--r-- | net/chan-sccp-b/patches/01-prevent-extra-optimization.patch | 20 |
3 files changed, 28 insertions, 21 deletions
diff --git a/net/chan-sccp-b/Makefile b/net/chan-sccp-b/Makefile index 31a4a14..1961af8 100644 --- a/net/chan-sccp-b/Makefile +++ b/net/chan-sccp-b/Makefile @@ -9,15 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chan-sccp-b -PKG_REV:=6728 -PKG_VERSION:=v4.2.3-r$(PKG_REV) -PKG_RELEASE:=2 +PKG_VERSION:=v4.3.0-20170814 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/branches/v4.2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=git://github.com/chan-sccp/chan-sccp.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=016fee3a96b09d5404757f7b178af2e349e55bcc +PKG_SOURCE_PROTO:=git PKG_FIXUP:=autoreconf @@ -64,10 +63,9 @@ Package/asterisk11-chan-sccp-b/description = $(Package/description/Default) Package/asterisk13-chan-sccp-b/description = $(Package/description/Default) CONFIGURE_ARGS += \ - --enable-static \ - --enable-section-relocation \ - --enable-conference \ + --disable-debug \ --enable-advanced-functions \ + --enable-conference \ --enable-video ifeq ($(BUILD_VARIANT),asterisk13) diff --git a/net/chan-sccp-b/patches/01-drop-Og-optimization.patch b/net/chan-sccp-b/patches/01-drop-Og-optimization.patch deleted file mode 100644 index ee952bd..0000000 --- a/net/chan-sccp-b/patches/01-drop-Og-optimization.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/autoconf/extra.m4 -+++ b/autoconf/extra.m4 -@@ -501,7 +501,7 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [ - ]) - ;; - esac -- CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} " -+ CFLAGS_saved="${CFLAGS_saved} " - ]) - - AS_IF([test "X${enable_debug}" == "Xyes"], [ diff --git a/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch b/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch new file mode 100644 index 0000000..19079c9 --- /dev/null +++ b/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch @@ -0,0 +1,20 @@ +--- a/autoconf/extra.m4 ++++ b/autoconf/extra.m4 +@@ -472,17 +472,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [ + ]) + CPPFLAGS_saved="${CPPFLAGS_saved} -D_FORTIFY_SOURCE=2" + GDB_FLAGS="" +- ], [ +- CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g' -e 's/[^|\ ]\-g[$|\ ]//g'`" +- optimize_flag="-O0" +- case "${CC}" in +- *gcc*) +- AX_CHECK_COMPILE_FLAG(-Og, [ +- optimize_flag="-Og" +- ]) +- ;; +- esac +- CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} " + ]) + + AS_IF([test "X${enable_debug}" == "Xyes"], [ |