Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/openwrt/archive.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2017-01-02 19:53:18 +0300
committerGitHub <noreply@github.com>2017-01-02 19:53:18 +0300
commit3b45b5ff47f2ebe4727042b837b7cf59d9dc3502 (patch)
tree22b4c8406ab2cd9840d8253ff1cf3160fc63b10d
parent9abd351d00130dd2cf7279d5a89a4400a93da2cf (diff)
parent1a893cf5630b9f52dfd163972cc15c0de4821519 (diff)
Merge pull request #221 from seragh/owrt-iperf-2.0.9-upstream-tarball-change
iperf: upstream changed tarball inplace
-rw-r--r--package/network/utils/iperf/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/package/network/utils/iperf/Makefile b/package/network/utils/iperf/Makefile
index 11970d1af3..b17ed0fc7b 100644
--- a/package/network/utils/iperf/Makefile
+++ b/package/network/utils/iperf/Makefile
@@ -9,12 +9,16 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iperf
PKG_VERSION:=2.0.9
+PKG_VERSION_SUFFIX:=a
PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/iperf2
-PKG_MD5SUM:=1bb3a1d98b1973aee6e8f171933c0f61
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_VERSION_SUFFIX).tar.gz
+# Temporary URL change - iperf upstream altered the already released target
+# without bumping the version number. The new tarball is renamed to avoid
+# conflicts with existing mirrored files.
+# PKG_SOURCE_URL:=@SF/iperf2
+PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+PKG_MD5SUM:=db02911f35686e808ed247160dfa766e08ae3f59d1e7dcedef0ffb2a6643f0bf
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-3-Clause
@@ -42,7 +46,7 @@ TARGET_CFLAGS += -D_GNU_SOURCE
CONFIGURE_ARGS += --disable-multicast
CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-rtti"
-CONFIGURE_VARS += LIBS="-lpthread"
+CONFIGURE_VARS += LIBS="-lpthread -lm"
define Package/iperf/install
$(INSTALL_DIR) $(1)/usr/bin