Browse Source

treewide: remove uClibc++ support

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Rosen Penev 5 months ago
parent
commit
39bc254663

+ 2 - 3
lang/python/pyodbc/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pyodbc
 PKG_VERSION:=4.0.30
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=852b5deeeb3366af8b4408efed993501708be45d221881bce60c9aac54be726a
@@ -18,7 +18,6 @@ PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_BUILD_DEPENDS:=unixodbc/host
 
 include ../pypi.mk
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
@@ -28,7 +27,7 @@ define Package/python3-pyodbc
   SUBMENU:=Python
   TITLE:=python3-pyodbc
   URL:=https://github.com/mkleehammer/pyodbc
-  DEPENDS:=+unixodbc +python3-light $(CXX_DEPENDS)
+  DEPENDS:=+unixodbc +python3-light +libstdcpp
 endef
 
 define Package/python3-pyodbc/description

+ 2 - 3
libs/db47/Makefile

@@ -6,13 +6,12 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/uclibc++.mk
 
 BASE_VERSION:=4.7.25
 
 PKG_NAME:=db47
 PKG_VERSION:=$(BASE_VERSION).4.NC
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/db-$(BASE_VERSION).NC
 PKG_SOURCE:=db-$(BASE_VERSION).NC.tar.gz
@@ -45,7 +44,7 @@ endef
 define Package/libdb47xx
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libdb47 $(CXX_DEPENDS)
+  DEPENDS:=+libdb47 +libstdcpp
   TITLE:=Berkeley DB library (4.7) for C++
   URL:=http://www.oracle.com/us/products/database/berkeley-db
   PROVIDES:=libdb47xx-full

+ 1 - 1
libs/gpgme/Makefile

@@ -31,7 +31,7 @@ define Package/libgpgmepp
   CATEGORY:=Libraries
   TITLE:=GnuPG Made Easy (GPGME) library (C++)
   URL:=https://gnupg.org/software/gpgme/index.html
-  DEPENDS:=+libgpgme +libstdcpp $(CXX_DEPENDS)
+  DEPENDS:=+libgpgme +libstdcpp
 endef
 
 define Package/libgpgme/description

+ 2 - 3
libs/ibrcommon/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ibrcommon
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
@@ -20,13 +20,12 @@ PKG_LICENSE:=Apache-2.0
 PKG_INSTALL:=1
 PKG_FIXUP:=libtool
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ibrcommon
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=$(CXX_DEPENDS) +librt +libnl +libopenssl
+  DEPENDS:=+libstdcpp +librt +libnl +libopenssl
   TITLE:=IBR Common C++ Library
 endef
 

+ 1 - 2
libs/ibrdtn/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ibrdtn
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
@@ -20,7 +20,6 @@ PKG_LICENSE:=Apache-2.0
 PKG_INSTALL:=1
 PKG_FIXUP:=libtool
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ibrdtn

+ 0 - 23
libs/ibrdtn/patches/010-Add-operator-to-Bundle-block_elem.patch

@@ -1,23 +0,0 @@
-From 199c86591edc7e82b92903efecadc4f69ea63370 Mon Sep 17 00:00:00 2001
-From: Johannes Morgenroth <jm@m-network.de>
-Date: Tue, 1 Jan 2019 11:25:50 +0100
-Subject: [PATCH] Add operator!=() to Bundle::block_elem
-
-Alternative implementations of libstdcpp as uclibc++ use it in
-the algorithm implemenetations.
----
- ibrdtn/data/Bundle.h | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/ibrdtn/data/Bundle.h
-+++ b/ibrdtn/data/Bundle.h
-@@ -69,6 +69,9 @@ namespace dtn
- 				bool operator==(const dtn::data::block_t &type) const {
- 					return (**this) == type;
- 				}
-+				bool operator!=(const dtn::data::block_t &type) const {
-+					return !((**this) == type);
-+				}
- 			};
- 
- 			typedef std::list<block_elem> block_list;

+ 0 - 20
libs/ibrdtn/patches/020-Use-const-iterator-in-const-function-of-MemoryBundle.patch

@@ -1,20 +0,0 @@
-From 6945698778caf7cdaace9ce8dae82162dbe2ee9f Mon Sep 17 00:00:00 2001
-From: Johannes Morgenroth <jm@m-network.de>
-Date: Thu, 3 Jan 2019 07:26:51 +0100
-Subject: [PATCH] Use const iterator in const function of MemoryBundleSet
-
----
- ibrdtn/data/MemoryBundleSet.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/ibrdtn/data/MemoryBundleSet.cpp
-+++ b/ibrdtn/data/MemoryBundleSet.cpp
-@@ -134,7 +134,7 @@ namespace dtn
- 				// the bundles set. This happen if the MemoryBundleSet gets deserialized.
- 				if (!_consistent) return true;
- 
--				bundle_set::iterator iter = _bundles.find(dtn::data::MetaBundle::create(bundle));
-+				bundle_set::const_iterator iter = _bundles.find(dtn::data::MetaBundle::create(bundle));
- 				return (iter != _bundles.end());
- 			}
- 

+ 0 - 37
libs/ibrdtn/patches/030-Use-std-streamoff-instead-of-std-streampos.patch

@@ -1,37 +0,0 @@
-From 1395d849d73147319ee422d2ce34de0bcb90e6f8 Mon Sep 17 00:00:00 2001
-From: Johannes Morgenroth <jm@m-network.de>
-Date: Thu, 3 Jan 2019 07:34:14 +0100
-Subject: [PATCH] Use std::streamoff instead of std::streampos
-
----
- ibrdtn/data/BundleMerger.cpp | 2 +-
- ibrdtn/data/Dictionary.cpp   | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/ibrdtn/data/BundleMerger.cpp
-+++ b/ibrdtn/data/BundleMerger.cpp
-@@ -119,7 +119,7 @@ namespace dtn
- 			}
- 
- 			ibrcommon::BLOB::iostream stream = c._blob.iostream();
--			(*stream).seekp(obj.fragmentoffset.get<std::streampos>());
-+			(*stream).seekp(obj.fragmentoffset.get<std::streamoff>());
- 
- 			const dtn::data::PayloadBlock &p = obj.find<dtn::data::PayloadBlock>();
- 			const Length plength = p.getLength();
---- a/ibrdtn/data/Dictionary.cpp
-+++ b/ibrdtn/data/Dictionary.cpp
-@@ -154,11 +154,11 @@ namespace dtn
- 		{
- 			char buffer[1024];
- 
--			_bytestream.seekg(scheme.get<std::streampos>());
-+			_bytestream.seekg(scheme.get<std::streamoff>());
- 			_bytestream.get(buffer, 1024, '\0');
- 			std::string scheme_str(buffer);
- 
--			_bytestream.seekg(ssp.get<std::streampos>());
-+			_bytestream.seekg(ssp.get<std::streamoff>());
- 			_bytestream.get(buffer, 1024, '\0');
- 			std::string ssp_str(buffer);
- 

+ 0 - 49
libs/ibrdtn/patches/040-Add-operator-to-BundleID-and-MetaBundle.patch

@@ -1,49 +0,0 @@
-From a5b9c2feeaabbd90c9734c5d865d471eed0d5e3a Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Thu, 28 Mar 2019 01:55:15 -0700
-Subject: [PATCH] Add operator!=() to BundleID and MetaBundle
-
-Needed for uClibc++.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- ibrdtn/data/Bundle.cpp | 10 ++++++++++
- ibrdtn/data/Bundle.h   |  2 ++
- 2 files changed, 12 insertions(+)
-
---- a/ibrdtn/data/Bundle.cpp
-+++ b/ibrdtn/data/Bundle.cpp
-@@ -71,11 +71,21 @@ namespace dtn
- 			return other == (const PrimaryBlock&)(*this);
- 		}
- 
-+		bool Bundle::operator!=(const BundleID& other) const
-+		{
-+			return other != (const PrimaryBlock&)(*this);
-+		}
-+
- 		bool Bundle::operator==(const MetaBundle& other) const
- 		{
- 			return other == (const PrimaryBlock&)(*this);
- 		}
- 
-+		bool Bundle::operator!=(const MetaBundle& other) const
-+		{
-+			return other != (const PrimaryBlock&)(*this);
-+		}
-+
- 		bool Bundle::operator!=(const Bundle& other) const
- 		{
- 			return (const PrimaryBlock&)(*this) != (const PrimaryBlock&)other;
---- a/ibrdtn/data/Bundle.h
-+++ b/ibrdtn/data/Bundle.h
-@@ -97,7 +97,9 @@ namespace dtn
- 			virtual ~Bundle();
- 
- 			bool operator==(const BundleID& other) const;
-+			bool operator!=(const BundleID& other) const;
- 			bool operator==(const MetaBundle& other) const;
-+			bool operator!=(const MetaBundle& other) const;
- 
- 			bool operator==(const Bundle& other) const;
- 			bool operator!=(const Bundle& other) const;

+ 2 - 3
libs/libv4l/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v4l-utils
 PKG_VERSION:=1.20.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://www.linuxtv.org/downloads/v4l-utils
@@ -22,7 +22,6 @@ PKG_BUILD_PARALLEL:=1
 
 PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
@@ -65,7 +64,7 @@ define Package/v4l-utils
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE+= utilities
-  DEPENDS:= +libv4l $(CXX_DEPENDS) $(ICONV_DEPENDS) $(INTL_DEPENDS)
+  DEPENDS:= +libv4l +libstdcpp $(ICONV_DEPENDS) $(INTL_DEPENDS)
   LICENSE:=GPL-2.0-or-later
   LICENSE_FILES:=COPYING
 endef

+ 2 - 3
libs/vips/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vips
 PKG_VERSION:=8.10.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION)
@@ -22,7 +22,6 @@ PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
@@ -32,7 +31,7 @@ define Package/vips
   CATEGORY:=Multimedia
   TITLE:=An image manipulation library
   URL:=https://libvips.github.io/libvips/
-  DEPENDS:=+glib2 +libexif +libexpat +libjpeg +libpng +giflib +libxml2 $(CXX_DEPENDS) $(INTL_DEPENDS)
+  DEPENDS:=+glib2 +libexif +libexpat +libjpeg +libpng +giflib +libxml2 +libstdcpp $(INTL_DEPENDS)
 endef
 
 CONFIGURE_ARGS += \

+ 2 - 3
multimedia/v4l2rtspserver/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v4l2rtspserver
 PKG_VERSION:=0.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 #cannot use codeload as this uses submodules
 PKG_SOURCE_PROTO:=git
@@ -27,7 +27,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
@@ -35,7 +34,7 @@ define Package/v4l2rtspserver
 	SECTION:=multimedia
 	CATEGORY:=Multimedia
 	TITLE:=v4l2rtspserver
-	DEPENDS:=$(CXX_DEPENDS)
+	DEPENDS:=+libstdcpp
 	URL:=https://github.com/mpromonet/v4l2rtspserver
 endef
 

+ 2 - 3
net/aircrack-ng/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aircrack-ng
 PKG_VERSION:=1.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:aircrack-ng:aircrack-ng
@@ -34,13 +34,12 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_AIRCRACK_NG_HWLOC \
 	CONFIG_AIRCRACK_NG_SQLITE3
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/aircrack-ng
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+AIRCRACK_NG_HWLOC:libhwloc +libpcap +libpcre +libpthread $(CXX_DEPENDS)
+  DEPENDS:=+AIRCRACK_NG_HWLOC:libhwloc +libpcap +libpcre +libpthread +libstdcpp
   DEPENDS += +AIRCRACK_NG_OPENSSL:libopenssl
   DEPENDS += +AIRCRACK_NG_GCRYPT:libgcrypt
   DEPENDS += +AIRCRACK_NG_SQLITE3:libsqlite3

+ 2 - 3
net/dcwapd/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dcwapd
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)?
@@ -23,7 +23,6 @@ PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dcwapd
@@ -32,7 +31,7 @@ define Package/dcwapd
   SUBMENU:=Routing and Redirection
   TITLE:=Dual-Channel WiFi AP daemon
   URL:=https://www.edgewaterwireless.com
-  DEPENDS:=$(CXX_DEPENDS) +kmod-macremapper +libdcwsocket +libdcwproto +mrmctl +libuci
+  DEPENDS:=+libstdcpp +kmod-macremapper +libdcwsocket +libdcwproto +mrmctl +libuci
 endef
 
 define Package/dcwapd/description

+ 1 - 2
net/ibrdtn-tools/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ibrdtn-tools
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
@@ -19,7 +19,6 @@ PKG_LICENSE:=Apache-2.0
 
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ibrdtn-tools

+ 1 - 2
net/ibrdtnd/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ibrdtnd
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases
@@ -21,7 +21,6 @@ PKG_LICENSE:=Apache-2.0
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ibrdtnd

+ 0 - 33
net/ibrdtnd/patches/010-no-const.patch

@@ -1,33 +0,0 @@
---- a/src/routing/SchedulingBundleIndex.cpp
-+++ b/src/routing/SchedulingBundleIndex.cpp
-@@ -28,7 +28,7 @@ namespace dtn
- 		void SchedulingBundleIndex::remove(const dtn::data::BundleID &id)
- 		{
- 			ibrcommon::MutexLock l(_index_mutex);
--			for (priority_index::const_iterator iter = _priority_index.begin(); iter != _priority_index.end(); ++iter)
-+			for (priority_index::iterator iter = _priority_index.begin(); iter != _priority_index.end(); ++iter)
- 			{
- 				const dtn::data::MetaBundle &b = (*iter);
- 				if (id == (const dtn::data::BundleID&)b) {
---- a/src/storage/MemoryBundleStorage.cpp
-+++ b/src/storage/MemoryBundleStorage.cpp
-@@ -217,7 +217,7 @@ namespace dtn
- 			ibrcommon::MutexLock l(_bundleslock);
- 
- 			// search for the bundle in the bundle list
--			const bundle_list::const_iterator iter = find(_bundles.begin(), _bundles.end(), id);
-+			const bundle_list::iterator iter = find(_bundles.begin(), _bundles.end(), id);
- 
- 			// if no bundle was found throw an exception
- 			if (iter == _bundles.end()) throw NoBundleFoundException();
---- a/src/storage/MetaStorage.cpp
-+++ b/src/storage/MetaStorage.cpp
-@@ -66,7 +66,7 @@ namespace dtn
- 		{
- 			std::set<dtn::data::EID> ret;
- 
--			for (dtn::data::BundleList::const_iterator iter = begin(); iter != end(); ++iter)
-+			for (const_iterator iter = begin(); iter != end(); ++iter)
- 			{
- 				const dtn::data::MetaBundle &bundle = (*iter);
- 

+ 8 - 16
net/iperf/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iperf
 PKG_VERSION:=2.0.13
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_HASH:=c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad
@@ -22,13 +22,12 @@ PKG_BUILD_PARALLEL:=1
 
 PKG_CONFIG_DEPENDS:=CONFIG_IPERF_ENABLE_MULTICAST
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iperf
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= $(CXX_DEPENDS) +libpthread
+  DEPENDS:= +libstdcpp +libpthread
   TITLE:=Internet Protocol bandwidth measuring tool
   URL:=http://sourceforge.net/projects/iperf2/
 endef
@@ -45,20 +44,13 @@ define Package/iperf/config
 		bool "Enable multicast support"
 endef
 
+CONFIGURE_ARGS += \
+	$(call autoconf_bool,CONFIG_IPERF_ENABLE_MULTICAST,multicast) \
+	$(call autoconf_bool,CONFIG_IPV6,ipv6)
 
-TARGET_CFLAGS += -D_GNU_SOURCE
-ifeq ($(CONFIG_IPERF_ENABLE_MULTICAST),y)
-CONFIGURE_ARGS += --enable-multicast
-else
-CONFIGURE_ARGS += --disable-multicast
-endif
-
-ifeq ($(CONFIG_IPV6),)
-	CONFIGURE_ARGS += --disable-ipv6
-endif
-
-CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-rtti"
-CONFIGURE_VARS += LIBS="-lpthread -lm"
+TARGET_CFLAGS += -flto
+TARGET_CXXFLAGS += -fno-rtti -static-libstdc++ -flto -std=c++11
+TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lpthread -lm)
 
 define Package/iperf/install
 	$(INSTALL_DIR) $(1)/usr/bin

+ 24 - 0
net/iperf/patches/020-math.patch

@@ -0,0 +1,24 @@
+--- a/src/pdfs.c
++++ b/src/pdfs.c
+@@ -80,7 +80,7 @@ float box_muller(void) {
+ 	    fprintf(stderr, "pdf box_muller() rand() error\n");
+ 	    return 0;
+ 	} else {
+-	    w = sqrt( (-2.0 * log( w ) ) / w );
++	    w = sqrt( (-2.0 * logf( w ) ) / w );
+ 	    y1 = x1 * w;
+ 	    y2 = x2 * w;
+ 	}
+@@ -93,8 +93,8 @@ float normal(float mean, float variance)
+ }
+ 
+ float lognormal(float mu, float sigma) {
+-    float phi = sqrt((mu * mu) + (sigma * sigma));
+-    float mu_prime = log(((mu * mu)/phi));
+-    float sigma_prime = sqrt(log((phi * phi)/(mu * mu)));
+-    return (exp(normal(mu_prime,sigma_prime)));
++    float phi = sqrtf((mu * mu) + (sigma * sigma));
++    float mu_prime = logf(((mu * mu)/phi));
++    float sigma_prime = sqrtf(logf((phi * phi)/(mu * mu)));
++    return (expf(normal(mu_prime,sigma_prime)));
+ }

+ 2 - 3
net/kismet/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kismet
 PKG_VERSION:=2016-07-R1
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_LICENSE:=LGPLv2.1
 PKG_CPE_ID:=cpe:/a:kismet:kismet
@@ -18,7 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.kismetwireless.net/code
 PKG_HASH:=bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/kismet/Default
@@ -26,7 +25,7 @@ define Package/kismet/Default
   CATEGORY:=Network
   TITLE:=Kismet
   MAINTAINER:=Jean-Michel lacroix <lacroix@lepine-lacroix.info>
-  DEPENDS:= $(CXX_DEPENDS) +libnl
+  DEPENDS:= +libstdcpp +libnl @BROKEN
   URL:=http://www.kismetwireless.net/
   SUBMENU:=Wireless
 endef

+ 2 - 3
net/lftp/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lftp
 PKG_VERSION:=4.9.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://lftp.tech/ftp/ \
@@ -24,14 +24,13 @@ PKG_CPE_ID:=cpe:/a:lftp_project:lftp
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lftp
   SUBMENU:=File Transfer
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libncurses +libopenssl +libreadline $(CXX_DEPENDS) +libexpat +zlib
+  DEPENDS:=+libncurses +libopenssl +libreadline +libstdcpp +libexpat +zlib
   TITLE:=a sophisticated file transfer program with command line interface.
   URL:=https://lftp.yar.ru/
 endef

+ 2 - 3
net/linknx/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linknx
 PKG_VERSION:=0.0.1.38
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-${PKG_VERSION}.tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/linknx/linknx/tar.gz/$(PKG_VERSION)?
@@ -22,7 +22,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone
 PKG_FIXUP:=autoreconf
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
@@ -31,7 +30,7 @@ define Package/linknx
   CATEGORY:=Network
   TITLE:=KNX home automation platform
   URL:=https://github.com/linknx/linknx
-  DEPENDS:=+pthsem +lua +luac +libcurl +libesmtp $(CXX_DEPENDS) $(ICONV_DEPENDS)
+  DEPENDS:=+pthsem +lua +luac +libcurl +libesmtp +libstdcpp $(ICONV_DEPENDS)
 endef
 
 CONFIGURE_ARGS+= \

+ 2 - 3
net/vncrepeater/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vncrepeater
 PKG_VERSION:=0.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Jirka Spicak <robutek@gmail.com> 
 PKG_LICENSE:=GPL-2.0
 
@@ -20,13 +20,12 @@ PKG_HASH:=79178e9baa9cac05f26e43f742933958707cb5c0632c51a5706b13922f3bb5b0
 
 PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vncrepeater
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=$(CXX_DEPENDS)
+  DEPENDS:=+libstdcpp
   TITLE:=UltraVNC repeater for Linux
   URL:=http://www.uvnc.com/addons/repeater.html
 endef

+ 2 - 3
sound/espeak/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=espeak
 PKG_VERSION:=1.48.04
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.zip
 PKG_SOURCE_URL:=@SF/espeak
@@ -21,13 +21,12 @@ PKG_LICENSE_FILES:=License.txt
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/espeak
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=$(CXX_DEPENDS) +portaudio
+  DEPENDS:=+libstdcpp +portaudio
   TITLE:=Speech synthesizer
   URL:=http://espeak.sourceforge.net/
 endef

+ 2 - 3
utils/gddrescue/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gddrescue
 PKG_VERSION:=1.23
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.xz
 PKG_SOURCE_URL:=http://http.debian.net/debian/pool/main/g/$(PKG_NAME)
@@ -19,7 +19,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gddrescue
@@ -27,7 +26,7 @@ define Package/gddrescue
   CATEGORY:=Utilities
   TITLE:=Data recovery tool
   URL:=https://www.gnu.org/software/ddrescue/
-  DEPENDS:=$(CXX_DEPENDS)
+  DEPENDS:=+libstdcpp
 endef
 
 define Package/gddrescue/description

+ 7 - 6
utils/hashdeep/Makefile

@@ -2,19 +2,20 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hashdeep
 PKG_VERSION:=4.4
-PKG_RELEASE:=1
-PKG_MAINTAINER=Tobe Deprez <trldp@outlook.com>
-PKG_LICENSE:=NLPL
-PKG_LICENSE_FILES:=COPYING
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/jessek/hashdeep/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=ad78d42142f9a74fe8ec0c61bc78d6588a528cbb9aede9440f50b6ff477f3a7f
 
+PKG_MAINTAINER:=Tobe Deprez <trldp@outlook.com>
+PKG_LICENSE:=NLPL
+PKG_LICENSE_FILES:=COPYING
+
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/hashdeep
@@ -22,7 +23,7 @@ define Package/hashdeep
   CATEGORY:=Utilities
   TITLE:=Recursively compute hashsums or piecewise hashings
   URL:=http://md5deep.sourceforge.net/
-  DEPENDS:=$(CXX_DEPENDS)
+  DEPENDS:=+libstdcpp
 endef
 
 define Package/hashdeep/description

+ 2 - 3
utils/powertop/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=powertop
 PKG_VERSION:=2.10
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://01.org/sites/default/files/downloads/
@@ -22,14 +22,13 @@ PKG_LICENSE:=GPL-2.0
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
 define Package/powertop
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=$(CXX_DEPENDS) $(INTL_DEPENDS) +libpci +libncursesw +libnl-genl
+  DEPENDS:=$(INTL_DEPENDS) +libstdcpp +libpci +libncursesw +libnl-genl
   TITLE:=Power consumption monitor
   URL:=https://01.org/powertop
 endef

+ 3 - 4
utils/qemu/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qemu
 PKG_VERSION:=5.0.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_HASH:=2f13a92a0fa5c8b69ff0796b59b86b080bbb92ebad5d301a7724dd06b5e78cb6
 PKG_SOURCE_URL:=http://download.qemu.org/
@@ -25,13 +25,12 @@ PKG_USE_MIPS16:=0
 
 PKG_BUILD_DEPENDS+=spice-protocol
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/package.mk
 
 QEMU_DEPS_IN_GUEST := @(TARGET_x86_64||TARGET_armvirt||TARGET_malta)
 QEMU_DEPS_IN_HOST := @(TARGET_x86_64||TARGET_sunxi)
-QEMU_DEPS_IN_HOST += $(CXX_DEPENDS)
+QEMU_DEPS_IN_HOST += +libstdcpp
 QEMU_DEPS_IN_HOST += $(ICONV_DEPENDS)
 
 define Package/virtio-console-helper
@@ -54,7 +53,7 @@ define Package/qemu-ga
   SUBMENU:=Virtualization
   TITLE:=QEMU Guest Agent
   URL:=http://www.qemu.org
-  DEPENDS:= +glib2 +virtio-console-helper $(CXX_DEPENDS) $(QEMU_DEPS_IN_GUEST)
+  DEPENDS:= +glib2 +virtio-console-helper +libstdcpp $(QEMU_DEPS_IN_GUEST)
 endef
 
 define Package/qemu-ga/install

+ 4 - 9
utils/smartmontools/Makefile

@@ -6,11 +6,10 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/uclibc++.mk
 
 PKG_NAME:=smartmontools
 PKG_VERSION:=7.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/smartmontools
@@ -34,7 +33,7 @@ endef
 
 define Package/smartmontools
   $(call Package/smartmontools/Default)
-  DEPENDS:=$(CXX_DEPENDS)
+  DEPENDS:=+libstdcpp
   TITLE+= Tool
 endef
 
@@ -47,7 +46,7 @@ endef
 
 define Package/smartd
   $(call Package/smartmontools/Default)
-  DEPENDS:=$(CXX_DEPENDS)
+  DEPENDS:=+libstdcpp
   TITLE+= Daemon
 endef
 
@@ -79,11 +78,6 @@ define Package/smartd-mail/description
   A script for mailing about SMART issues
 endef
 
-ifeq ($(CONFIG_USE_UCLIBCXX),y)
-TARGET_LDFLAGS +=-nodefaultlibs
-else
-CONFIGURE_VARS += with_cxx11_regex=yes
-endif
 TARGET_LDFLAGS += -flto
 
 TARGET_CXXFLAGS +=-fno-rtti -flto
@@ -97,6 +91,7 @@ CONFIGURE_ARGS += \
 
 #lower file size vs. CONFIGURE_ARGS
 CONFIGURE_VARS += \
+	with_cxx11_regex=yes \
 	with_smartdplugindir=no \
 	with_systemdenvfile=no \
 	with_systemdsystemunitdir=no \

+ 2 - 3
utils/ssdeep/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ssdeep
 PKG_VERSION:=2.14.1
-PKG_RELEASE=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/ssdeep-project/ssdeep/releases/download/release-$(PKG_VERSION)/
@@ -22,7 +22,6 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ssdeep
@@ -30,7 +29,7 @@ define Package/ssdeep
   CATEGORY:=Utilities
   TITLE:=A program to compute and match fuzzy hashes
   URL:=https://ssdeep-project.github.io/ssdeep
-  DEPENDS:=$(CXX_DEPENDS)
+  DEPENDS:=+libstdcpp
 endef
 
 define Package/ssdeep/description

+ 1 - 5
utils/unrar/Makefile

@@ -23,12 +23,8 @@ PKG_CPE_ID:=cpe:/a:rarlab:unrar
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(CONFIG_USE_UCLIBCXX),y)
-TARGET_LDFLAGS +=-nodefaultlibs
-endif
 TARGET_CXXFLAGS +=-fno-rtti -flto
 TARGET_LDFLAGS +=$(FPIC) -Wl,--gc-sections $(if $(CONFIG_USE_GLIBC),-lpthread)
 
@@ -36,7 +32,7 @@ define Package/unrar/Default
   TITLE:=UnRAR
   SUBMENU:=Compression
   URL:=https://www.rarlab.com/
-  DEPENDS:=$(CXX_DEPENDS) +libpthread
+  DEPENDS:=+libstdcpp +libpthread
 endef
 
 define Package/unrar