treewide: remove uClibc++ support

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2021-02-22 20:58:58 -08:00
parent f2d7f216a4
commit 39bc254663
31 changed files with 83 additions and 257 deletions

View File

@@ -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

View File

@@ -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)));
}