From 6857bc21ebb7ab6408a968797f699921f0fb6441 Mon Sep 17 00:00:00 2001
From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sun, 18 Feb 2018 10:14:13 +0100
Subject: [PATCH 1/2] net/pcapsipdump: Remove uclibc++.mk include

The include injects a lib depend on libuClibc++.so.0 into the package,
even on musl. Remove it and replace the depend with libstcpp instead.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---
 net/pcapsipdump/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/pcapsipdump/Makefile b/net/pcapsipdump/Makefile
index 7a903aa..68ee687 100644
--- a/net/pcapsipdump/Makefile
+++ b/net/pcapsipdump/Makefile
@@ -18,14 +18,13 @@ 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 $(CXX_DEPENDS)
+  DEPENDS:=+libpcap +libstdcpp
   TITLE:=SIP sessions dumping tool
   URL:=http://sourceforge.net/projects/pcapsipdump/
 endef

From fb78b0b53667f61736447de577e09149ff7457a3 Mon Sep 17 00:00:00 2001
From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sun, 18 Feb 2018 10:16:32 +0100
Subject: [PATCH 2/2] net/pcapsipdump: Simplify Makefile

Use the default Build/Compile. Use MAKE_VARS to set up the variables
that are used by pcapsipdump's Makefile.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---
 net/pcapsipdump/Makefile | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/net/pcapsipdump/Makefile b/net/pcapsipdump/Makefile
index 68ee687..1494689 100644
--- a/net/pcapsipdump/Makefile
+++ b/net/pcapsipdump/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-2018 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcapsipdump
 PKG_VERSION:=0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pcapsipdump
@@ -35,15 +35,9 @@ define Package/pcapsipdump/description
  (even if there is thousands of concurrect SIP sessions).
 endef
 
-TARGET_CC=$(TARGET_CXX)
-
-define Build/Compile
-	$(TARGET_CONFIGURE_OPTS) \
-		$(MAKE) -C $(PKG_BUILD_DIR) \
-		CPPFLAGS="$(TARGET_CXXFLAGS) $(TARGET_CPPFLAGS) -fno-rtti"  \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		LIBS="-lpcap"
-endef
+MAKE_VARS += \
+	CC="$(TARGET_CXX)" \
+	CPPFLAGS="$(TARGET_CXXFLAGS) -fno-rtti $(TARGET_CPPFLAGS)"
 
 define Package/pcapsipdump/install
 	$(INSTALL_DIR) $(1)/usr/bin