- added libunwind bcond, no libunwind on x32

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index bf26cbd5f0cb849ebdb1bfc06b3b19d13ee7552f..e7102508efe0ce21769d616777ba2980b1cc3b42 100644 (file)
--- 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} \