[packages/lttng-tools] - updated x32 patch - requires lttng-ust 2.10 to build - release 2

[qboosh]

commit d126f1252ecd754ed12ba955ece2549bdcc0ce63
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Dec 25 10:05:26 2017 +0100

    - updated x32 patch
    - requires lttng-ust 2.10 to build
    - release 2

 lttng-tools.spec |  6 +++---
 x32.patch        | 25 ++++++++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/lttng-tools.spec b/lttng-tools.spec
index c633b15..820e275 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -2,7 +2,7 @@ Summary:	LTTng Trace Control
 Summary(pl.UTF-8):	Sterowanie śledzeniem LTTng
 Name:		lttng-tools
 Version:	2.10.1
-Release:	1
+Release:	2
 License:	LGPL v2.1+ (library), GPL v2 (tools)
 Group:		Libraries
 Source0:	http://lttng.org/files/lttng-tools/%{name}-%{version}.tar.bz2
@@ -20,7 +20,7 @@ BuildRequires:	kmod-devel
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libuuid-devel
 BuildRequires:	libxml2-devel >= 1:2.7.6
-BuildRequires:	lttng-ust-devel >= 2.7.0
+BuildRequires:	lttng-ust-devel >= 2.10.0
 BuildRequires:	popt-devel >= 1.13
 BuildRequires:	python3-devel >= 1:3.2
 BuildRequires:	rpmbuild(macros) >= 1.219
@@ -29,7 +29,7 @@ BuildRequires:	userspace-rcu-devel >= 0.8.0
 BuildRequires:	xmlto
 #BuildRequires:	jdk java-lttng-ust # used for tests only
 Requires:	libxml2 >= 1:2.7.6
-Requires:	lttng-ust >= 2.7.0
+Requires:	lttng-ust >= 2.10.0
 Requires:	popt >= 1.13
 Requires:	userspace-rcu >= 0.8.0
 Requires:	uname(release) >= 2.6.27
diff --git a/x32.patch b/x32.patch
index 064a233..910ffa5 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,11 +1,22 @@
---- lttng-tools-2.6.0/src/bin/lttng/utils.c~	2015-01-26 18:17:15.000000000 +0100
-+++ lttng-tools-2.6.0/src/bin/lttng/utils.c	2015-07-30 19:45:25.632045712 +0200
-@@ -130,7 +130,7 @@
- #define HAS_FLS_U32
- #endif
+--- lttng-tools-2.10.1/src/bin/lttng/utils.c.orig	2017-08-03 21:42:22.082587260 +0200
++++ lttng-tools-2.10.1/src/bin/lttng/utils.c	2017-12-25 09:44:22.494015902 +0100
+@@ -156,7 +156,7 @@
+ static inline
+ unsigned int fls_u64(uint64_t x)
+ {
+-	long r;
++	int64_t r;
  
--#if defined(__x86_64)
-+#if defined(__x86_64) && !defined(__ILP32__)
+ 	asm("bsrq %1,%0\n\t"
+ 	    "jnz 1f\n\t"
+--- lttng-tools-2.10.1/src/common/utils.c.orig	2017-08-03 21:42:22.102586698 +0200
++++ lttng-tools-2.10.1/src/common/utils.c	2017-12-25 09:37:09.418605350 +0100
+@@ -1021,7 +1021,7 @@
  static inline
  unsigned int fls_u64(uint64_t x)
  {
+-	long r;
++	int64_t r;
+ 
+ 	asm("bsrq %1,%0\n\t"
+ 	    "jnz 1f\n\t"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lttng-tools.git/commitdiff/d126f1252ecd754ed12ba955ece2549bdcc0ce63