pool/gdb
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix Leap 15.3 s390x gdb:testsuite build, by not requiring 32-bit

Browse Source 
packages for openSUSE s390x.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=285
This commit is contained in:
Tom de Vries 2021-06-17 11:22:20 +00:00 committed by Git OBS Bridge
parent ff02746d9f
commit abc58e4280
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 17 11:19:14 UTC 2021 - Tom de Vries <tdevries@suse.com>
- Fix Leap 15.3 s390x gdb:testsuite build, by not requiring 32-bit
packages for openSUSE s390x.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 17 10:18:44 UTC 2021 - Tom de Vries <tdevries@suse.com> Thu Jun 17 10:18:44 UTC 2021 - Tom de Vries <tdevries@suse.com>

23
gdb.spec
View File

@ -445,16 +445,6 @@ BuildRequires: babeltrace-devel
%endif #!s390x %endif #!s390x
%endif #!el5 %endif #!el5
%ifarch s390x
%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
%define leap_15_3_s390x 1
%else
%define leap_15_3_s390x 0
%endif
%else
%define leap_15_3_s390x 0
%endif
BuildRequires: dejagnu BuildRequires: dejagnu
BuildRequires: sharutils BuildRequires: sharutils
# gcc-objc++ is not covered by the GDB testsuite. # gcc-objc++ is not covered by the GDB testsuite.
@ -466,17 +456,24 @@ BuildRequires: %{gcc}-objc
%ifarch %ada_arch %ifarch %ada_arch
BuildRequires: %{gcc}-ada BuildRequires: %{gcc}-ada
%endif %endif
%if 0%{!?disable_32bit:1}
%if 0%{?is_opensuse}
# openSUSE for s390x doesn't build 32bit libs # openSUSE for s390x doesn't build 32bit libs
%define supported_32bit_arch x86_64 ppc64
%else
%define supported_32bit_arch x86_64 ppc64 s390x
%endif
%if 0%{!?disable_32bit:1}
%if 0%{suse_version} > 1110 %if 0%{suse_version} > 1110
%ifarch x86_64 ppc64 s390x %ifarch %{supported_32bit_arch}
%if 0%{suse_version} >= 1330 %if 0%{suse_version} >= 1330
# Older distros miss this pseudo package, the Ada # Older distros miss this pseudo package, the Ada
# testsuite won't work completely # testsuite won't work completely
BuildRequires: %{gcc}-ada-32bit BuildRequires: %{gcc}-ada-32bit
%endif %endif
BuildRequires: %{gcc}-c++-32bit BuildRequires: %{gcc}-c++-32bit
%if 0%{suse_version} >= 1210 && 0%{suse_version} != 1315 && %{leap_15_3_s390x} == 0 %if 0%{suse_version} >= 1210 && 0%{suse_version} != 1315
# glibc-devel-static-32bit is (currently?) unavailable for Leap 15.3/s390x. # glibc-devel-static-32bit is (currently?) unavailable for Leap 15.3/s390x.
BuildRequires: glibc-devel-static-32bit BuildRequires: glibc-devel-static-32bit
%endif %endif