Merge pull request #290 from micmac1/revert-telephony

Revert uclibc++ commits
This commit is contained in:
Jiri Slachta 2018-03-04 20:24:42 +01:00 committed by GitHub
commit b2127aadb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pcapsipdump PKG_NAME:=pcapsipdump
PKG_VERSION:=0.2 PKG_VERSION:=0.2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/pcapsipdump PKG_SOURCE_URL:=@SF/pcapsipdump
@ -18,13 +18,14 @@ PKG_HASH:=4d4dc2664963c08de40da47ca0dcd1eeae09edc42241bd6daa7ff8c59089dce9
PKG_LICENSE:=GPL-2.0+ PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/pcapsipdump define Package/pcapsipdump
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Telephony SUBMENU:=Telephony
DEPENDS:=+libpcap +libstdcpp DEPENDS:=+libpcap $(CXX_DEPENDS)
TITLE:=SIP sessions dumping tool TITLE:=SIP sessions dumping tool
URL:=http://sourceforge.net/projects/pcapsipdump/ URL:=http://sourceforge.net/projects/pcapsipdump/
endef endef

View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=yate PKG_NAME:=yate
PKG_VERSION:=6.0.0-1 PKG_VERSION:=6.0.0-1
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate6/ PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate6/
@ -28,6 +28,7 @@ PKG_INSTALL:=1
# Yate currently does not compile with FORTIFY_SOURCE enabled # Yate currently does not compile with FORTIFY_SOURCE enabled
PKG_FORTIFY_SOURCE:=0 PKG_FORTIFY_SOURCE:=0
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)/Default define Package/$(PKG_NAME)/Default
@ -39,7 +40,7 @@ endef
define Package/$(PKG_NAME) define Package/$(PKG_NAME)
$(call Package/yate/Default) $(call Package/yate/Default)
DEPENDS:=+libpthread +libstdcpp DEPENDS:=+libpthread $(CXX_DEPENDS)
TITLE:=Yet Another Telephony Engine TITLE:=Yet Another Telephony Engine
MENU:=1 MENU:=1
endef endef