[Crosstoolchain-logs] [device-tree-compiler] 01/02: Add patch from upstream to fix building on 32-bit systems.

Vagrant Cascadian vagrant at moszumanska.debian.org
Fri Sep 29 01:48:38 UTC 2017


This is an automated email from the git hooks/post-receive script.

vagrant pushed a commit to branch debian/master
in repository device-tree-compiler.

commit 6e4ba735e47c22bd1af22c873bd68d000e5027b4
Author: Vagrant Cascadian <vagrant at debian.org>
Date:   Thu Sep 28 18:37:39 2017 -0700

    Add patch from upstream to fix building on 32-bit systems.
---
 ...cks-Use-proper-format-modifier-for-size_t.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/02-checks-Use-proper-format-modifier-for-size_t.patch b/debian/patches/02-checks-Use-proper-format-modifier-for-size_t.patch
new file mode 100644
index 0000000..7dfe4e7
--- /dev/null
+++ b/debian/patches/02-checks-Use-proper-format-modifier-for-size_t.patch
@@ -0,0 +1,41 @@
+From 497432fd2131967f349e69dc5d259072151cc4b4 Mon Sep 17 00:00:00 2001
+From: Thierry Reding <treding at nvidia.com>
+Date: Wed, 27 Sep 2017 15:04:09 +0200
+Subject: [PATCH 1/3] checks: Use proper format modifier for size_t
+
+The size of size_t can vary between architectures, so using %ld isn't
+going to work on 32-bit builds. Use the %zu modifier to make sure it is
+always correct.
+
+Signed-off-by: Thierry Reding <treding at nvidia.com>
+Acked-by: Rob Herring <robh at kernel.org>
+Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
+---
+ checks.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/checks.c b/checks.c
+index 902f2e3..08a3a29 100644
+--- a/checks.c
++++ b/checks.c
+@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check *c,
+ 	int cell, cellsize = 0;
+ 
+ 	if (prop->val.len % sizeof(cell_t)) {
+-		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
++		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+ 		     prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
+ 		return;
+ 	}
+@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c,
+ 		return;
+ 
+ 	if (irq_prop->val.len % sizeof(cell_t))
+-		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
++		FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+ 		     irq_prop->name, irq_prop->val.len, sizeof(cell_t),
+ 		     node->fullpath);
+ 
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 7f8f39e..0e0c6d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_build_doc.patch
+02-checks-Use-proper-format-modifier-for-size_t.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git



More information about the Crosstoolchain-logs mailing list