diff options
| -rw-r--r-- | packages/netperf/files/cpu_set.patch | 24 | ||||
| -rw-r--r-- | packages/netperf/netperf_2.4.4.bb | 5 |
2 files changed, 28 insertions, 1 deletions
diff --git a/packages/netperf/files/cpu_set.patch b/packages/netperf/files/cpu_set.patch new file mode 100644 index 0000000000..b2b95c78b7 --- /dev/null +++ b/packages/netperf/files/cpu_set.patch @@ -0,0 +1,24 @@ +Index: netperf-2.4.4/src/netlib.c +=================================================================== +--- netperf-2.4.4.orig/src/netlib.c 2007-10-17 23:16:02.000000000 +0200 ++++ netperf-2.4.4/src/netlib.c 2008-12-03 17:56:32.000000000 +0100 +@@ -1988,10 +1988,15 @@ + fall-back on what we had before, which is to use just the size of + an unsigned long. raj 2006-09-14 */ + +-#if defined(__CPU_SETSIZE) +-#define NETPERF_CPU_SETSIZE __CPU_SETSIZE +-#define NETPERF_CPU_SET(cpu, cpusetp) __CPU_SET(cpu, cpusetp) +-#define NETPERF_CPU_ZERO(cpusetp) __CPU_ZERO (cpusetp) ++#if defined(CPU_SETSIZE) ++#define NETPERF_CPU_SETSIZE CPU_SETSIZE ++#define NETPERF_CPU_SET(cpu, cpusetp) CPU_SET(cpu, cpusetp) ++#define NETPERF_CPU_ZERO(cpusetp) CPU_ZERO (cpusetp) ++ typedef cpu_set_t netperf_cpu_set_t; ++#elif defined(__CPU_SETSIZE) ++#define NETPERF_CPU_SETSIZE __CPU_SETSIZE ++#define NETPERF_CPU_SET(cpu, cpusetp) __CPU_SET (cpu, cpusetp) ++#define NETPERF_CPU_ZERO(cpusetp) __CPU_ZERO (cpusetp) + typedef cpu_set_t netperf_cpu_set_t; + #else + #define NETPERF_CPU_SETSIZE sizeof(unsigned long) diff --git a/packages/netperf/netperf_2.4.4.bb b/packages/netperf/netperf_2.4.4.bb index 1594e8ee7a..0af225ffba 100644 --- a/packages/netperf/netperf_2.4.4.bb +++ b/packages/netperf/netperf_2.4.4.bb @@ -2,15 +2,18 @@ DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets SECTION = "console/network" HOMEPAGE = "http://www.netperf.org/" LICENSE = "netperf" +PR = "r1" SRC_URI="ftp://ftp.netperf.org/netperf/netperf-${PV}.tar.bz2 \ + file://cpu_set.patch;patch=1 \ file://init" inherit update-rc.d autotools S = "${WORKDIR}/netperf-${PV}" -CFLAGS_append = " -DDO_UNIX -DDO_IPV6" +# cpu_set.patch plus _GNU_SOURCE makes src/netlib.c compile with CPU_ macros +CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" do_install() { install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d |