[packages/xorg-xserver-server] - added libunwind bcond, no libunwind on x32

baggins baggins at pld-linux.org
Tue Dec 30 20:29:59 CET 2014


commit 2c00f60de6b48de45be1f8404199ff4022db6d41
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Dec 30 19:29:22 2014 +0000

    - added libunwind bcond, no libunwind on x32

 xorg-xserver-server.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index bf26cbd..e710250 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -16,6 +16,7 @@
 %bcond_without	wayland		# Wayland DDX (Xwayland server)
 %bcond_without	glamor		# glamor dix module
 %bcond_without	systemtap	# systemtap/dtrace probes
+%bcond_without	libunwind	# use libunwind for backtracing
 #
 # ABI versions, see hw/xfree86/common/xf86Module.h
 %define	xorg_xserver_server_ansic_abi		0.4
@@ -26,6 +27,10 @@
 
 %define	pixman_ver	0.30.0
 
+%ifarch x32
+%undefine	with_libunwind
+%endif
+
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
@@ -70,7 +75,7 @@ BuildRequires:	libepoxy-devel
 %endif
 %{?with_xselinux:BuildRequires:	libselinux-devel >= 2.0.86}
 BuildRequires:	libtool >= 2:2.2
-BuildRequires:	libunwind-devel
+%{?with_libunwind:BuildRequires:	libunwind-devel}
 BuildRequires:	libxcb-devel >= 1.6
 BuildRequires:	pam-devel
 BuildRequires:	perl-base
@@ -489,7 +494,7 @@ fi
 	--enable-glx-tls \
 	--enable-install-libxf86config \
 	--enable-kdrive \
-	--enable-libunwind \
+	%{?with_libunwind:--enable-libunwind} \
 	%{?with_record:--enable-record} \
 	--enable-secure-rpc \
 	%{?with_xcsecurity:--enable-xcsecurity} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-server.git/commitdiff/3a45b4a89dfebd758670c3feb7b02adf7717b275



More information about the pld-cvs-commit mailing list