From: Rosen Penev Date: Sat, 14 Dec 2019 05:25:03 +0000 (-0800) Subject: iperf: Fix compilation with libcxx X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fd211e1677fc653feeef6b0b8b8e8659ac274b3c;p=openwrt%2Fstaging%2Fstintel.git iperf: Fix compilation with libcxx Avoids redefining bool. Signed-off-by: Rosen Penev --- diff --git a/package/network/utils/iperf/Makefile b/package/network/utils/iperf/Makefile index 33d00b43d7..3a235fadc7 100644 --- a/package/network/utils/iperf/Makefile +++ b/package/network/utils/iperf/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf PKG_VERSION:=2.0.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad diff --git a/package/network/utils/iperf/patches/010-libcxx.patch b/package/network/utils/iperf/patches/010-libcxx.patch new file mode 100644 index 0000000000..cf0124232f --- /dev/null +++ b/package/network/utils/iperf/patches/010-libcxx.patch @@ -0,0 +1,12 @@ +--- a/config.h.in ++++ b/config.h.in +@@ -360,7 +360,9 @@ + #undef _REENTRANT + + /* */ ++#ifndef __cplusplus + #undef bool ++#endif + + /* Define to empty if `const' does not conform to ANSI C. */ + #undef const