diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-07-17 20:10:10 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-24 18:58:51 +0200 |
| commit | 4022026b7ed9eb2e521c3c47b06f12cfb721dabf (patch) | |
| tree | 82891aaffb35f2f717b870849638df148ce9afc8 /meta-oe | |
| parent | caf460d7fc1b6e22e23504a52dd1ba5ed9194791 (diff) | |
| download | meta-openembedded-contrib-4022026b7ed9eb2e521c3c47b06f12cfb721dabf.tar.gz | |
nicstat: Fix build on musl/x86_64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch | 37 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/nicstat/nicstat_1.95.bb | 4 |
2 files changed, 40 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch b/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch new file mode 100644 index 0000000000..a208f97eb2 --- /dev/null +++ b/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch @@ -0,0 +1,37 @@ +From 52590fbf735cef3fec85a042458aa89a02c52b57 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2017 11:33:12 -0700 +Subject: [PATCH] nicstat.c: Do not define uint64_t and uint32_t + +Use the defines from platform + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + nicstat.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/nicstat.c b/nicstat.c +index 83ad557..2a6e0c1 100644 +--- a/nicstat.c ++++ b/nicstat.c +@@ -32,6 +32,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <unistd.h> + #include <string.h> + #include <ctype.h> +@@ -88,8 +89,6 @@ + #define PROC_NET_BUFSIZ (128 * 1024) + #define PROC_UPTIME "/proc/uptime" + /* Needs to be fixed if not built under ILP32 */ +-typedef unsigned long long uint64_t; +-typedef unsigned int uint32_t; + extern char *optarg; + extern int optind, opterr, optopt; + #endif /* OS_LINUX */ +-- +2.13.3 + diff --git a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb index 5126a31cd6..3875f0f605 100644 --- a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb +++ b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb @@ -5,7 +5,9 @@ HOMEPAGE = "http://nicstat.sourceforge.net" LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4a94da2a1f918b217ef5156634fc9e0" -SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz" +SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz \ + file://0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch \ + " SRC_URI[md5sum] = "9a0b87bbc670c1e738e5b40c7afd184d" SRC_URI[sha256sum] = "c4cc33f8838f4523f27c3d7584eedbe59f4c587f0821612f5ac2201adc18b367" |