forked from pool/xorg-x11-server
Accepting request 310175 from home:michalsrb:branches:X11:XOrg
- Fix build of s390/s390x (bnc#933503) OBS-URL: https://build.opensuse.org/request/show/310175 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=571
This commit is contained in:
parent
8d1dd68bbf
commit
ac77ba8596
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 3 15:36:00 UTC 2015 - msrb@suse.com
|
||||||
|
|
||||||
|
- Fix build of s390/s390x (bnc#933503)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat May 30 04:38:38 UTC 2015 - eich@suse.com
|
Sat May 30 04:38:38 UTC 2015 - eich@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package xorg-x11-server
|
# spec file for package xorg-x11-server
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -296,15 +296,16 @@ autoreconf -fi
|
|||||||
--with-sha1=libcrypto \
|
--with-sha1=libcrypto \
|
||||||
--disable-linux-acpi \
|
--disable-linux-acpi \
|
||||||
--disable-linux-apm \
|
--disable-linux-apm \
|
||||||
|
%ifarch s390 s390x
|
||||||
|
--disable-xwayland \
|
||||||
|
--disable-xorg \
|
||||||
|
--disable-aiglx \
|
||||||
|
%else
|
||||||
%if 0%{?suse_version} > 1310
|
%if 0%{?suse_version} > 1310
|
||||||
--enable-xwayland \
|
--enable-xwayland \
|
||||||
%else
|
%else
|
||||||
--disable-xwayland \
|
--disable-xwayland \
|
||||||
%endif
|
%endif
|
||||||
%ifarch s390 s390x
|
|
||||||
--disable-xorg \
|
|
||||||
--disable-aiglx \
|
|
||||||
%else
|
|
||||||
--enable-xorg \
|
--enable-xorg \
|
||||||
%if 0%{?suse_version} > 1120
|
%if 0%{?suse_version} > 1120
|
||||||
--enable-config-udev \
|
--enable-config-udev \
|
||||||
@ -358,11 +359,7 @@ rm -f %{buildroot}%{_datadir}/aclocal/*.m4
|
|||||||
%endif
|
%endif
|
||||||
%ifarch s390 s390x
|
%ifarch s390 s390x
|
||||||
rm -f %{buildroot}%{_sysconfdir}/X11/10-evdev.conf
|
rm -f %{buildroot}%{_sysconfdir}/X11/10-evdev.conf
|
||||||
make -C hw/xfree86/parser
|
mkdir -p %{buildroot}%{_includedir}/xorg
|
||||||
mkdir -p %{buildroot}%{_includedir}/xorg \
|
|
||||||
%{buildroot}%{_libdir}
|
|
||||||
install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
|
|
||||||
%{buildroot}%{_includedir}/xorg
|
|
||||||
install -m 644 include/list.h \
|
install -m 644 include/list.h \
|
||||||
%{buildroot}%{_includedir}/xorg
|
%{buildroot}%{_includedir}/xorg
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user