sipp: version bump, build fixes

- bumped to 3.5.1
- removed musl patch because it was upstreamed
- add patch to fix ncurses detection
- fixes issue #125

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-08-10 20:47:36 +02:00
parent a5f9875fa7
commit 85d15f25f9
3 changed files with 21 additions and 40 deletions

View file

@ -1,5 +1,5 @@
#
# Copyright (C) 2013-2015 OpenWrt.org
# Copyright (C) 2013-2017 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -8,25 +8,25 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sipp
PKG_VERSION:=3.3.990
PKG_RELEASE:=2
PKG_VERSION:=3.5.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/sipp
PKG_MD5SUM:=904fffbc277bafce28762ebb041b9620
PKG_CHECK_FORMAT_SECURITY:=0
PKG_SOURCE_URL:=https://github.com/SIPp/sipp/releases/download/v$(PKG_VERSION)
PKG_HASH:=56421ba7b43b67e9b04e21894b726502a82a6149fc86ba06df33dfc7252a1891
PKG_LICENSE:=GPL-2.0+ BSD-3-Clause Zlib
PKG_LICENSE_FILES:=LICENSE.txt
include $(INCLUDE_DIR)/uclibc++.mk
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk
define Package/sipp
SECTION:=net
CATEGORY:=Network
SUBMENU:=Telephony
DEPENDS:= +libncurses +libpthread $(CXX_DEPENDS)
DEPENDS:=+libncurses +libpthread +libstdcpp
TITLE:=test tool / traffic generator for the SIP protocol
URL:=http://sipp.sourceforge.net/
endef
@ -38,34 +38,16 @@ define Package/sipp/description
methods.
endef
TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components 1 $(TAR_OPTIONS)
CONFIGURE_ARGS+= \
--build=$(GNU_HOST_NAME) \
--host=$(GNU_TARGET_NAME) \
--target=$(GNU_TARGET_NAME) \
--enable-epoll \
--without-gsl \
--without-pcap \
--with-rtpstream \
--without-sctp
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CC_linux="$(TARGET_CXX)" \
CPP_linux="$(TARGET_CXX)" \
CCLINK_linux="$(TARGET_CXX)" \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS_linux="$(TARGET_CPPFLAGS) -fno-rtti" \
LFLAGS_linux="$(TARGET_LDFLAGS)" \
LIBS="-lncurses -ldl -lpthread -lm" \
all
endef
define Package/sipp/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/sipp $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/sipp $(1)/usr/bin
endef
$(eval $(call BuildPackage,sipp))

View file

@ -0,0 +1,11 @@
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ case "$host" in
esac
# ==================== checks for libraries =============================
-AC_CHECK_LIB(curses,initscr,,[AC_MSG_ERROR([ncurses library missing])])
+AC_CHECK_LIB(ncurses,initscr,,[AC_MSG_ERROR([ncurses library missing])])
AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread",
AC_MSG_ERROR(pthread library needed!))

View file

@ -1,12 +0,0 @@
--- a/src/auth.c
+++ b/src/auth.c
@@ -22,9 +22,7 @@
* Frederique Aurouet
*/
-#if defined( __FreeBSD__) || defined(__DARWIN) || defined(__SUNOS)
#include <sys/types.h>
-#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>