Skip to contentSkip to conversation

package/iperf3: fix musl build

PATCH New Bernd Kuhls 3 participants 3 messages Jan 30, 2016 – Feb 7, 2016

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v2 1/1 package/iperf3: fix musl build

Ported -D_GNU_SOURCE from https://dev.openwrt.org/changeset/45103

Signed-off-by Bernd Kuhls <[email protected]>
---
 .../iperf3/0002-Fix-build-using-musl-libc.patch    | 43 ++++++++++++++++++++++
 package/iperf3/iperf3.mk                           |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 package/iperf3/0002-Fix-build-using-musl-libc.patch
package/iperf3/0002-Fix-build-using-musl-libc.patch new file +43 -0
new file mode 100644
index 0000000..f220360
@@ -0,0 +1,43 @@
+From 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sat, 30 Jan 2016 19:23:20 +0100
+Subject: [PATCH 1/1] Fix build using musl libc
+
+Fixes https://github.com/esnet/iperf/issues/331
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+Patch sent upstream: https://github.com/esnet/iperf/pull/344
+
+ src/cjson.h | 2 ++
+ src/timer.h | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/cjson.h b/src/cjson.h
+index d4449e6..7af19a9 100644
+--- a/src/cjson.h
++++ b/src/cjson.h
+@@ -23,6 +23,8 @@
+ #ifndef cJSON__h
+ #define cJSON__h
+ 
++#include <stdint.h>
++
+ #ifdef __cplusplus
+ extern "C"
+ {
+diff --git a/src/timer.h b/src/timer.h
+index 0f9c5eb..9b22b7f 100644
+--- a/src/timer.h
++++ b/src/timer.h
+@@ -30,6 +30,7 @@
+ #ifndef __TIMER_H
+ #define __TIMER_H
+ 
++#include <stdint.h>
+ #include <sys/time.h>
+ 
+ /* TimerClientData is an opaque value that tags along with a timer.  The
+-- 
+2.7.0.rc3
+
package/iperf3/iperf3.mk +2 -0
index 885a599..74d6cce 100644
@@ -9,4 +9,6 @@ IPERF3_SITE = $(call github,esnet,iperf,$(IPERF3_VERSION))
 IPERF3_LICENSE = BSD-3c, BSD-2c, MIT
 IPERF3_LICENSE_FILES = LICENSE
 
+IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+
 $(eval $(autotools-package))
Signature · 1 line
2.7.0.rc3
#1 lore raw

PATCH v2 1/1 package/iperf3: fix musl build

Quoted 3 lines · Bernd Kuhls

Ported -D_GNU_SOURCE from https://dev.openwrt.org/changeset/45103

Signed-off-by Bernd Kuhls <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 67 lines
---
 .../iperf3/0002-Fix-build-using-musl-libc.patch    | 43 ++++++++++++++++++++++
 package/iperf3/iperf3.mk                           |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 package/iperf3/0002-Fix-build-using-musl-libc.patch
package/iperf3/0002-Fix-build-using-musl-libc.patch new file +43 -0
new file mode 100644
index 0000000..f220360
@@ -0,0 +1,43 @@
+From 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sat, 30 Jan 2016 19:23:20 +0100
+Subject: [PATCH 1/1] Fix build using musl libc
+
+Fixes https://github.com/esnet/iperf/issues/331
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+Patch sent upstream: https://github.com/esnet/iperf/pull/344
+
+ src/cjson.h | 2 ++
+ src/timer.h | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/cjson.h b/src/cjson.h
+index d4449e6..7af19a9 100644
+--- a/src/cjson.h
++++ b/src/cjson.h
+@@ -23,6 +23,8 @@
+ #ifndef cJSON__h
+ #define cJSON__h
+ 
++#include <stdint.h>
++
+ #ifdef __cplusplus
+ extern "C"
+ {
+diff --git a/src/timer.h b/src/timer.h
+index 0f9c5eb..9b22b7f 100644
+--- a/src/timer.h
++++ b/src/timer.h
+@@ -30,6 +30,7 @@
+ #ifndef __TIMER_H
+ #define __TIMER_H
+ 
++#include <stdint.h>
+ #include <sys/time.h>
+ 
+ /* TimerClientData is an opaque value that tags along with a timer.  The
+-- 
+2.7.0.rc3
+
package/iperf3/iperf3.mk +2 -0
index 885a599..74d6cce 100644
@@ -9,4 +9,6 @@ IPERF3_SITE = $(call github,esnet,iperf,$(IPERF3_VERSION))
 IPERF3_LICENSE = BSD-3c, BSD-2c, MIT
 IPERF3_LICENSE_FILES = LICENSE
 
+IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+
 $(eval $(autotools-package))
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Applied
#2 lore raw

PATCH v2 1/1 package/iperf3: fix musl build

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 8 lines · Bernd Kuhls

Ported -D_GNU_SOURCE from https://dev.openwrt.org/changeset/45103

Signed-off-by Bernd Kuhls <[email protected]>
---
 .../iperf3/0002-Fix-build-using-musl-libc.patch    | 43 ++++++++++++++++++++++
 package/iperf3/iperf3.mk                           |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 package/iperf3/0002-Fix-build-using-musl-libc.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com