From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sun, 4 Mar 2018 18:21:09 +0000 (+0100)
Subject: yate: revert uclibc++ commit
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ecfb5062eff15f90093da26ad3e03e9fcc6a2462;p=feed%2Ftelephony.git

yate: revert uclibc++ commit

This reverts commit b8b9818a13366e69eb769aeee973db18eecfcca8.

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 <sebastian_ml@gmx.net>
---

diff --git a/net/yate/Makefile b/net/yate/Makefile
index f57a6e7..94310dc 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=yate
 PKG_VERSION:=6.0.0-1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 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
 PKG_FORTIFY_SOURCE:=0
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)/Default
@@ -39,7 +40,7 @@ endef
 
 define Package/$(PKG_NAME)
   $(call Package/yate/Default)
-  DEPENDS:=+libpthread +libstdcpp
+  DEPENDS:=+libpthread $(CXX_DEPENDS)
   TITLE:=Yet Another Telephony Engine
   MENU:=1
 endef