[packages/ltrace] - upstream fix for compilation warning - rel 2

baggins baggins at pld-linux.org
Thu Jan 30 09:01:51 CET 2014


commit 7f5350462b1d89ce58e807001b222bc9a6708483
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jan 30 09:01:32 2014 +0100

    - upstream fix for compilation warning
    - rel 2

 ltrace-assert.patch | 38 ++++++++++++++++++++++++++++++++++++++
 ltrace.spec         |  4 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/ltrace.spec b/ltrace.spec
index 3658bd6..dbb1c97 100644
--- a/ltrace.spec
+++ b/ltrace.spec
@@ -6,12 +6,13 @@ Summary(ru.UTF-8):	Выводит трассу библиотечных и си
 Summary(uk.UTF-8):	Видає трасу бібліотечних та системних викликів програми
 Name:		ltrace
 Version:	0.7.3
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Development/Debuggers
 Source0:	ftp://ftp.debian.org/debian/pool/main/l/ltrace/%{name}_%{version}.orig.tar.bz2
 # Source0-md5:	b3dd199af8f18637f7d4ef97fdfb9d14
 Patch0:		%{name}-calls.patch
+Patch1:		%{name}-assert.patch
 URL:		http://ltrace.alioth.debian.org/
 BuildRequires:	binutils-devel
 BuildRequires:	elfutils-devel
@@ -71,6 +72,7 @@ Ltrace - це програма, яка запускає вказану прог
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
diff --git a/ltrace-assert.patch b/ltrace-assert.patch
new file mode 100644
index 0000000..63579cf
--- /dev/null
+++ b/ltrace-assert.patch
@@ -0,0 +1,38 @@
+From: Peter Wu <lekensteyn at gmail.com>
+Date: Wed, 25 Sep 2013 22:55:55 +0000 (+0200)
+Subject: Fix compile warning about unused typedef
+X-Git-Url: http://anonscm.debian.org/gitweb/?p=collab-maint%2Fltrace.git;a=commitdiff_plain;h=a77b267abb870c935f9b4187ca31409fa5eb9dcb
+
+Fix compile warning about unused typedef
+
+Switch assertion to style as used by the Linux kernel (BUILD_BUG_ON)
+
+Signed-off-by: Peter Wu <lekensteyn at gmail.com>
+---
+
+diff --git a/lens_default.c b/lens_default.c
+index e0c0566..84b74ea 100644
+--- a/lens_default.c
++++ b/lens_default.c
+@@ -345,7 +345,7 @@ format_array(FILE *stream, struct value *value, struct value_dict *arguments,
+ {
+ 	/* We need "long" to be long enough to cover the whole address
+ 	 * space.  */
+-	typedef char assert__long_enough_long[-(sizeof(long) < sizeof(void *))];
++	(void)sizeof(char[1 - 2*(sizeof(long) < sizeof(void *))]);
+ 	long l;
+ 	if (expr_eval_word(length, value, arguments, &l) < 0)
+ 		return -1;
+diff --git a/value.c b/value.c
+index d18db17..8caf98c 100644
+--- a/value.c
++++ b/value.c
+@@ -284,7 +284,7 @@ value_init_deref(struct value *ret_val, struct value *valp)
+ 
+ 	/* We need "long" to be long enough to hold platform
+ 	 * pointers.  */
+-	typedef char assert__long_enough_long[-(sizeof(l) < sizeof(void *))];
++	(void)sizeof(char[1 - 2*(sizeof(l) < sizeof(void *))]);
+ 
+ 	value_common_init(ret_val, valp->inferior, valp,
+ 			  valp->type->u.ptr_info.info, 0);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ltrace.git/commitdiff/7f5350462b1d89ce58e807001b222bc9a6708483



More information about the pld-cvs-commit mailing list