From da85405911d5eb5affddd17ab42aff14e4f6e2ba Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 4 Mar 2018 19:18:33 +0100 Subject: [PATCH] pcapsipdump: revert uclibc++ commit This reverts commit 6857bc21ebb7ab6408a968797f699921f0fb6441. In hindsight I have to admit I did not correctly understand the implications of the uclibc++.mk include. The include allows a package to follow the user's choice regarding which C++ library should be the standard. Linking against uClibc++ instead of libstd++ is not a problem when running musl (which is what I had incorrectly assumed), as both C++ libs are separate packages. And uClibc++ is a lot smaller than libstd++, which is probably why it is even the default C++ lib on OpenWrt currently. Signed-off-by: Sebastian Kemper --- net/pcapsipdump/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/pcapsipdump/Makefile b/net/pcapsipdump/Makefile index 1494689..d259b17 100644 --- a/net/pcapsipdump/Makefile +++ b/net/pcapsipdump/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcapsipdump PKG_VERSION:=0.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/pcapsipdump @@ -18,13 +18,14 @@ PKG_HASH:=4d4dc2664963c08de40da47ca0dcd1eeae09edc42241bd6daa7ff8c59089dce9 PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=LICENSE +include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk define Package/pcapsipdump SECTION:=net CATEGORY:=Network SUBMENU:=Telephony - DEPENDS:=+libpcap +libstdcpp + DEPENDS:=+libpcap $(CXX_DEPENDS) TITLE:=SIP sessions dumping tool URL:=http://sourceforge.net/projects/pcapsipdump/ endef -- 2.30.2