public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Kevin Buettner <kevinb@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gdb] gdb-17.2-rebase-f44: Update gdb-6.3-rh-testversion-20041202.patch
Date: Sun, 28 Jun 2026 00:00:58 GMT [thread overview]
Message-ID: <178260485823.1.10514295315292206133.rpms-gdb-00fe7519d488@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/gdb
Branch : gdb-17.2-rebase-f44
Commit : 00fe7519d4883c827a5993e078cdd86bde4f7c08
Author : Kevin Buettner <kevinb@redhat.com>
Date : 2023-01-27T12:02:27-07:00
Stats : +8/-4 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/gdb/c/00fe7519d4883c827a5993e078cdd86bde4f7c08?branch=gdb-17.2-rebase-f44
Log:
Update gdb-6.3-rh-testversion-20041202.patch
...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.
---
diff --git a/gdb-6.3-rh-testversion-20041202.patch b/gdb-6.3-rh-testversion-20041202.patch
index 82c693b..b8c7940 100644
--- a/gdb-6.3-rh-testversion-20041202.patch
+++ b/gdb-6.3-rh-testversion-20041202.patch
@@ -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 $" {
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"
+ }
}
@@ -32,7 +32,7 @@ diff --git a/gdb/top.c b/gdb/top.c
struct internalvar *minor_version_var = create_internalvar ("_gdb_minor");
int vmajor = 0, vminor = 0, vrevision = 0;
- 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 (minor_version_var, vminor + (vrevision > 0));
}
diff --git a/gdb.spec b/gdb.spec
index ed14526..b293475 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -40,7 +40,7 @@ ExcludeArch: aarch64
# Include support for Guile? This is enabled on RHEL 8 and
# Fedora < 38.
%if (0%{?fedora:1} && 0%{?fedora} < 38) || (0%{?rhel:1} && 0%{?rhel} == 8)
-%define use_guile
+%define use_guile 1
%endif
Name: %{?scl_prefix}gdb
@@ -54,7 +54,7 @@ Version: 12.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.
-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
# Do not provide URL for snapshots as the file lasts there only for 2 days.
@@ -1190,6 +1190,10 @@ fi
%endif
%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>
- Remove gdb-rhbz1398387-tab-crash-test.patch as that test didn't
work anymore.
reply other threads:[~2026-06-28 0:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178260485823.1.10514295315292206133.rpms-gdb-00fe7519d488@fedoraproject.org \
--to=kevinb@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox