rpms/gdb
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update gdb-6.3-rh-testversion-20041202.patch

Browse Source 
...so that $_gdb_major and $_gdb_minor will be obtained correctly.

Also, change define of 'use_guile' from empty (which rpmbuild
complained about) to a value of 1.  I encountered this problem
while attempting to build on F37.
This commit is contained in:
Kevin Buettner 2023-01-27 12:02:27 -07:00
parent a5f9e28701
commit 00fe7519d4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb-6.3-rh-testversion-20041202.patch
View File

@ -18,7 +18,7 @@ diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest
-re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" { -re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" {
pass "printed version with cast" pass "printed version with cast"
} }
+ -re ".\[0-9\]+ = .(Fedora|Red Hat Enterprise Linux) \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" { + -re ".\[0-9\]+ = .(Fedora Linux|Red Hat Enterprise Linux) \[\\(\\)0-9.a-z\\-\]+.*$gdb_prompt $" {
+ pass "printed version Fedora or Red Hat Enterprise Linux only" + pass "printed version Fedora or Red Hat Enterprise Linux only"
+ } + }
} }
@ -32,7 +32,7 @@ diff --git a/gdb/top.c b/gdb/top.c
struct internalvar *minor_version_var = create_internalvar ("_gdb_minor"); struct internalvar *minor_version_var = create_internalvar ("_gdb_minor");
int vmajor = 0, vminor = 0, vrevision = 0; int vmajor = 0, vminor = 0, vrevision = 0;
- sscanf (version, "%d.%d.%d", &vmajor, &vminor, &vrevision); - sscanf (version, "%d.%d.%d", &vmajor, &vminor, &vrevision);
+ sscanf (version, "Fedora %d.%d.%d", &vmajor, &vminor, &vrevision); + sscanf (version, "%*[^0123456789]%d.%d.%d", &vmajor, &vminor, &vrevision);
set_internalvar_integer (major_version_var, vmajor); set_internalvar_integer (major_version_var, vmajor);
set_internalvar_integer (minor_version_var, vminor + (vrevision > 0)); set_internalvar_integer (minor_version_var, vminor + (vrevision > 0));
} }

8
gdb.spec
View File

@ -40,7 +40,7 @@ ExcludeArch: aarch64
# Include support for Guile? This is enabled on RHEL 8 and # Include support for Guile? This is enabled on RHEL 8 and
# Fedora < 38. # Fedora < 38.
%if (0%{?fedora:1} && 0%{?fedora} < 38) || (0%{?rhel:1} && 0%{?rhel} == 8) %if (0%{?fedora:1} && 0%{?fedora} < 38) || (0%{?rhel:1} && 0%{?rhel} == 8)
%define use_guile %define use_guile 1
%endif %endif
Name: %{?scl_prefix}gdb Name: %{?scl_prefix}gdb
@ -54,7 +54,7 @@ Version: 12.1
# The release always contains a leading reserved number, start it at 1. # The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
Release: 15%{?dist} Release: 16%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
# Do not provide URL for snapshots as the file lasts there only for 2 days. # Do not provide URL for snapshots as the file lasts there only for 2 days.
@ -1190,6 +1190,10 @@ fi
%endif %endif
%changelog %changelog
* Fri Jan 27 2023 Kevin Buettner <kevinb@redhat.com> - 12.1-16
- Tweak gdb-6.3-rh-testversion-20041202.patch so that $_gdb_major
and $_gdb_minor will be obtained correctly.
* Thu Jan 26 2023 Bruno Larsen <blarsen@redhat.com> * Thu Jan 26 2023 Bruno Larsen <blarsen@redhat.com>
- Remove gdb-rhbz1398387-tab-crash-test.patch as that test didn't - Remove gdb-rhbz1398387-tab-crash-test.patch as that test didn't
work anymore. work anymore.