[packages/lttng-tools] - fix building on x32 - rel 2

[baggins]

commit ea3cd7d6445e5e1d7a0888efea19a985aca5c5f1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jul 30 19:50:07 2015 +0200

    - fix building on x32
    - rel 2

 lttng-tools.spec | 10 ++++++++--
 x32.patch        | 11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/lttng-tools.spec b/lttng-tools.spec
index 0b0fe49..636173e 100644
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@ -2,12 +2,13 @@ Summary:	LTTng Trace Control
 Summary(pl.UTF-8):	Sterowanie śledzeniem LTTng
 Name:		lttng-tools
 Version:	2.6.0
-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
 # Source0-md5:	0478f60395f9564b4a19f45ce7b7f3df
 Patch0:		%{name}-python.patch
+Patch1:		x32.patch
 URL:		http://lttng.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.10
@@ -79,6 +80,7 @@ Wiązanie Pythona do LTTng.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -91,7 +93,11 @@ Wiązanie Pythona do LTTng.
 	--disable-silent-rules \
 	--enable-python-bindings \
 	--with-babeltrace-bin=/usr/bin/babeltrace \
-%ifnarch alpha ia64
+%ifnarch x32
+	--with-consumerd32-bin=/usr/libx32/lttng/libexec/lttng-consumerd \
+	--with-consumerd32-libdir=/usr/libx32 \
+%endif
+%ifnarch alpha ia64 x32
 	--with-consumerd32-bin=/usr/lib/lttng/libexec/lttng-consumerd \
 	--with-consumerd32-libdir=/usr/lib \
 %endif
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..064a233
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- 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
+ 
+-#if defined(__x86_64)
++#if defined(__x86_64) && !defined(__ILP32__)
+ static inline
+ unsigned int fls_u64(uint64_t x)
+ {
================================================================

---- gitweb:

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