From 15f2c5b0c791c4db25d55489016b83e5268ede2b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 2 Jul 2012 14:21:32 -0400 Subject: [PATCH] Replace usage of "struct siginfo" with "siginfo_t". --- crash.spec | 5 ++++- struct_siginfo_to_siginfo_t.patch | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 struct_siginfo_to_siginfo_t.patch diff --git a/crash.spec b/crash.spec index eaddcba..b28e93c 100644 --- a/crash.spec +++ b/crash.spec @@ -14,6 +14,7 @@ ExclusiveArch: %{ix86} ia64 x86_64 ppc64 s390 s390x %{arm} Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: ncurses-devel zlib-devel Requires: binutils +Patch0: struct_siginfo_to_siginfo_t.patch %description The core analysis suite is a self-contained tool that can be used to @@ -34,6 +35,7 @@ offered by Mission Critical Linux, or the LKCD kernel patch. %prep %setup -n %{name}-%{version} -q +%patch0 -p1 -b struct_siginfo_to_siginfo_t.patch %build make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}" @@ -63,7 +65,8 @@ rm -rf %{buildroot} %changelog * Mon Jul 1 2012 Dave Anderson - 6.0.8-1 -- Update to latest upstream release +- Update to latest upstream release. +- Replace usage of "struct siginfo" with "siginfo_t". * Mon Apr 30 2012 Dave Anderson - 6.0.6-1 - Update to latest upstream release diff --git a/struct_siginfo_to_siginfo_t.patch b/struct_siginfo_to_siginfo_t.patch new file mode 100644 index 0000000..e90d2ae --- /dev/null +++ b/struct_siginfo_to_siginfo_t.patch @@ -0,0 +1,17 @@ +--- crash-6.0.8/gdb-7.3.1.patch.orig ++++ crash-6.0.8/gdb-7.3.1.patch +@@ -1526,3 +1526,14 @@ diff -up gdb-7.3.1/gdb/psymtab.c.orig gd + + return NULL; + +} + #endif ++--- gdb-7.3.1/gdb/linux-nat.h.orig +++++ gdb-7.3.1/gdb/linux-nat.h ++@@ -60,7 +60,7 @@ struct lwp_info ++ ++ /* Non-zero si_signo if this LWP stopped with a trap. si_addr may ++ be the address of a hardware watchpoint. */ ++- struct siginfo siginfo; +++ siginfo_t siginfo; ++ ++ /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data ++ watchpoint trap. */