[oe-commits] Khem Raj : collectd: Backport fix build with newer gcc
git at git.openembedded.org
git at git.openembedded.org
Tue Mar 3 07:38:12 UTC 2015
Module: meta-openembedded.git
Branch: master-next
Commit: 95b064c2bbea8899245da20ad02f75f8594b2e18
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=95b064c2bbea8899245da20ad02f75f8594b2e18
Author: Khem Raj <raj.khem at gmail.com>
Date: Sun Mar 1 22:25:06 2015 +0000
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 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
...ure-size_t-portability-in-DEBUG-statement.patch | 30 ++++++++++++++++++++++
.../recipes-extended/collectd/collectd_5.4.1.bb | 1 +
2 files changed, 31 insertions(+)
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 0000000..52b9a86
--- /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 at 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 92b231c..6e40076 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"
More information about the Openembedded-commits
mailing list