From a92d03ecaf6e272ff63485a7388c9f54ec036004 Mon Sep 17 00:00:00 2001 From: Jakub Raczynski Date: Sat, 2 Mar 2024 21:07:43 +0800 Subject: [PATCH 1/2] iperf3: Fix dependecy conflict with iperf3-ssl When selecting both iperf3 and iperf3 ssl, there is a problem that both packages install same binary file. This patch fixes this issue by adding conflict between those packages. Signed-off-by: Jakub Raczynski --- net/iperf3/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/net/iperf3/Makefile b/net/iperf3/Makefile index df730018..c03e0cd1 100644 --- a/net/iperf3/Makefile +++ b/net/iperf3/Makefile @@ -45,6 +45,7 @@ $(call Package/iperf3/default) TITLE+= with iperf_auth support VARIANT:=ssl DEPENDS:=+libopenssl + CONFLICTS:=iperf3 endef define Package/libiperf3 From 1b041b16c60e5359b3fc35b110b8d6fa9ae92e8d Mon Sep 17 00:00:00 2001 From: Jonas Jelonek Date: Sat, 2 Mar 2024 21:11:41 +0800 Subject: [PATCH 2/2] iperf3: update to 3.16 notable changes: - multithreading support changelog: https://github.com/esnet/iperf/releases/tag/3.16 Signed-off-by: Jonas Jelonek --- net/iperf3/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/iperf3/Makefile b/net/iperf3/Makefile index c03e0cd1..33ac0ed8 100644 --- a/net/iperf3/Makefile +++ b/net/iperf3/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iperf -PKG_VERSION:=3.12 +PKG_VERSION:=3.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf -PKG_HASH:=72034ecfb6a7d6d67e384e19fb6efff3236ca4f7ed4c518d7db649c447e1ffd6 +PKG_HASH:=cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause @@ -44,7 +44,7 @@ define Package/iperf3-ssl $(call Package/iperf3/default) TITLE+= with iperf_auth support VARIANT:=ssl - DEPENDS:=+libopenssl + DEPENDS:=+libopenssl +libatomic CONFLICTS:=iperf3 endef @@ -53,9 +53,11 @@ define Package/libiperf3 CATEGORY:=Libraries TITLE:=Internet Protocol bandwidth measuring library URL:=https://github.com/esnet/iperf + DEPENDS+=+libatomic endef TARGET_CFLAGS += -D_GNU_SOURCE +TARGET_LDFLAGS += -latomic ifeq ($(BUILD_VARIANT), ssl) CONFIGURE_ARGS += --with-openssl="$(STAGING_DIR)/usr" --disable-shared