Skip to content
Snippets Groups Projects
Commit 8a0359ef authored by Kevin Daudt's avatar Kevin Daudt :computer:
Browse files

main/iperf: fix build on 32-bits arches

iperf uses a long to hold a time, but musl now uses 64-bits time_t (long
long) on 32-bit
parent 5407e17d
No related branches found
No related tags found
1 merge request!15805main/iperf: fix build on 32-bits arches
......@@ -12,6 +12,7 @@ subpackages="$pkgname-doc $pkgname-openrc"
source="https://sourceforge.net/projects/iperf2/files/iperf-$pkgver.tar.gz
iperf.initd
iperf.confd
long-to-time-t.patch
"
build() {
./configure \
......@@ -37,4 +38,5 @@ package() {
sha512sums="7ef370bdbf5b0b38925d81fedc0c5b4afaa083e7212bff34b4f3577ac9ca595a672160bc5d7bdc20d161673880a59073ee1ac5f15099de743fdb00b490039c56 iperf-2.0.14a.tar.gz
7dcd51fa77f7e8bd9a14339f61f93f591d74a86c767dbdc1d6035b6f7f4ce6fec34e8880caf68eab301640250b579b495274f2454c48b9601455ec46abab8949 iperf.initd
fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd"
fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8 iperf.confd
3ef92f0a096f3cf378187788c8a0a0ff8f75e38954d048ec023c47f5bc64adda575b99e2d5d3030e07a19814a50ec8b5d215d23d2587ecb188b590c11544c7df long-to-time-t.patch"
Description: musl uses 64-bits time_t on 32-bits arches
Upstream: no
diff --git a/src/Settings.cpp b/src/Settings.cpp
index fd1d314..b1853a6 100644
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -1054,7 +1054,7 @@ void Settings_ModalOptions (struct thread_Settings *mExtSettings) {
bail = true;
} else if (isTxStartTime(mExtSettings) || isTxHoldback(mExtSettings)) {
Timestamp now;
- long nowsecs = now.getSecs();
+ time_t nowsecs = now.getSecs();
// fill out the formats in the event they are needed per an time error
char start_timebuf[80];
struct tm ts = *localtime(&mExtSettings->txstart_epoch.tv_sec);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment