CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

spice: fix compile error on 32bit system

Browse Source 
Fix below compile error on 32bit system,  since input argument
is uLong, but use format %d:
format '%d' expects argument of type 'int', but argument 6 has type
'long unsigned int' [-Werror=format=]

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Changqing Li 2018-09-13 13:37:36 +08:00 committed by Khem Raj
parent e5c84d8365
commit cff2f38874
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
meta-networking/recipes-support/spice/spice/0001-spice-fix-compile-fail-problem.patch Normal file
View File

@ -0,0 +1,36 @@
From 7023732c65b4dc509c46a54fb7715da275b5597f Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 13 Sep 2018 12:39:44 +0800
Subject: [PATCH] spice: fix compile fail problem
compile error:
format '%d' expects argument of type 'int', but argument 6 has
type 'long unsigned int' [-Werror=format=]
spice compile failed on 32bit system, since upstream commit
9541cd2fe(in V0.14.1) change %ld to %PRIdPTR, %PRIdPTR is %d, but argument
strm.total_out is uLong.
Upstream-Status: Submitted[https://github.com/freedesktop/spice/pull/1]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
server/red-replay-qxl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/red-replay-qxl.c b/server/red-replay-qxl.c
index 1fce76c..bd33b58 100644
--- a/server/red-replay-qxl.c
+++ b/server/red-replay-qxl.c
@@ -266,7 +266,7 @@ static replay_t read_binary(SpiceReplay *replay, const char *prefix, size_t *siz
exit(1);
}
if ((ret = inflate(&strm, Z_NO_FLUSH)) != Z_STREAM_END) {
- spice_error("inflate error %d (disc: %" PRIdPTR ")", ret, *size - strm.total_out);
+ spice_error("inflate error %d (disc: %ld)", ret, *size - strm.total_out);
if (ret == Z_DATA_ERROR) {
/* last operation may be wrong. since we do the recording
* in red_worker, when there is a shutdown from the vcpu/io thread
--
2.7.4

1
meta-networking/recipes-support/spice/spice_git.bb
View File

@ -24,6 +24,7 @@ SRC_URI = " \
git://anongit.freedesktop.org/spice/spice;name=spice \
git://anongit.freedesktop.org/spice/spice-common;destsuffix=git/subprojects/spice-common;name=spice-common \
file://0001-Convert-pthread_t-to-be-numeric.patch \
file://0001-spice-fix-compile-fail-problem.patch \
"
FOO = "\