diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-03-01 22:25:06 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-03-03 08:36:00 +0100 |
| commit | 95b064c2bbea8899245da20ad02f75f8594b2e18 (patch) | |
| tree | 77094d43cee46407c5e5f2db14b8df85ee15eae3 /meta-oe/recipes-extended | |
| parent | fe1f11a062da26736dc4fe7f6625f1595689d66e (diff) | |
| download | meta-openembedded-contrib-95b064c2bbea8899245da20ad02f75f8594b2e18.tar.gz | |
collectd: Backport fix build with newer gcc
on mips we get the errors of type mismatch
Change-Id: Ib7b3bd243417d1ba77e8167daf761fd4a2fc2e64
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/collectd/collectd_5.4.1.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch b/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch new file mode 100644 index 0000000000..52b9a86cb5 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch @@ -0,0 +1,30 @@ +From f6c89c17955223bf8c99a901ca6f901b83fa521f Mon Sep 17 00:00:00 2001 +From: Marc Fournier <marc.fournier@camptocamp.com> +Date: Wed, 3 Dec 2014 16:15:28 +0100 +Subject: [PATCH] netlink: ensure size_t portability in DEBUG() statement + +This prevents the following error when building on 32bit systems with +gcc 4.7.2: + +netlink.c: In function 'ir_read': +netlink.c:783:7: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'size_t' [-Werror=format] +--- + src/netlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/netlink.c b/src/netlink.c +index 422dc8c..3c4642c 100644 +--- a/src/netlink.c ++++ b/src/netlink.c +@@ -683,7 +683,7 @@ static int ir_read (void) + continue; + } + +- DEBUG ("netlink plugin: ir_read: querying %s from %s (%lu).", ++ DEBUG ("netlink plugin: ir_read: querying %s from %s (%zu).", + type_name[type_index], iflist[ifindex], ifindex); + + nlh = mnl_nlmsg_put_header (buf); +-- +2.1.4 + diff --git a/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb b/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb index 92b231c81e..6e40076ebb 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb @@ -9,6 +9,7 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://no-gcrypt-badpath.patch \ file://collectd-version.patch \ file://glibc-2.20-compatiblity.patch \ + file://0001-netlink-ensure-size_t-portability-in-DEBUG-statement.patch \ file://collectd.init \ file://collectd.service" SRC_URI[md5sum] = "6f56c71c96573a7f4f7fb3bfab185974" |