rpms/systemtap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Correct some patch names

Browse Source
This commit is contained in:
William Eden Cohen 2008-02-21 16:10:49 +00:00
parent aab626afd3
commit 9b64947560
3 changed files with 89 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
systemtap-0.6.1-elfi.patch Normal file
View File

@ -0,0 +1,15 @@
Index: runtime/stack-i386.c
===================================================================
RCS file: /cvs/systemtap/src/runtime/stack-i386.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -u -r1.6 -r1.7
--- runtime/stack-i386.c 18 Jan 2008 08:47:31 -0000 1.6
+++ runtime/stack-i386.c 27 Jan 2008 18:27:40 -0000 1.7
@@ -24,5 +24,5 @@
#ifdef STAPCONF_X86_UNIREGS
unsigned long ebp = regs->bp;
- #elif
+ #else
unsigned long ebp = regs->ebp;
#endif

71
systemtap-0.6.1-gcc43.patch Normal file
View File

@ -0,0 +1,71 @@
diff -up systemtap-0.6.1/staptree.cxx.orig systemtap-0.6.1/staptree.cxx
--- systemtap-0.6.1/staptree.cxx.orig 2008-01-17 21:53:20.000000000 -0500
+++ systemtap-0.6.1/staptree.cxx 2008-02-12 11:16:00.000000000 -0500
@@ -2370,3 +2370,30 @@ deep_copy_visitor::deep_copy (expression
require <expression*> (&v, &n, s);
return n;
}
+
+template <> void
+require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src)
+{
+ if (src != NULL)
+ {
+ symbol *array_src=NULL, *array_dst=NULL;
+ hist_op *hist_src=NULL, *hist_dst=NULL;
+
+ classify_indexable(src, array_src, hist_src);
+
+ *dst = NULL;
+
+ if (array_src)
+ {
+ require <symbol*> (v, &array_dst, array_src);
+ *dst = array_dst;
+ }
+ else
+ {
+ require <hist_op*> (v, &hist_dst, hist_src);
+ *dst = hist_dst;
+ }
+ assert (*dst);
+ }
+}
+
diff -up systemtap-0.6.1/staptree.h.orig systemtap-0.6.1/staptree.h
--- systemtap-0.6.1/staptree.h.orig 2008-01-17 21:53:20.000000000 -0500
+++ systemtap-0.6.1/staptree.h 2008-02-12 11:16:00.000000000 -0500
@@ -846,31 +846,8 @@ require (deep_copy_visitor* v, T* dst, T
}
}
-template <> static void
-require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src)
-{
- if (src != NULL)
- {
- symbol *array_src=NULL, *array_dst=NULL;
- hist_op *hist_src=NULL, *hist_dst=NULL;
-
- classify_indexable(src, array_src, hist_src);
-
- *dst = NULL;
-
- if (array_src)
- {
- require <symbol*> (v, &array_dst, array_src);
- *dst = array_dst;
- }
- else
- {
- require <hist_op*> (v, &hist_dst, hist_src);
- *dst = hist_dst;
- }
- assert (*dst);
- }
-}
+template <> void
+require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src);
template <typename T> void
provide (deep_copy_visitor* v, T src)

6
systemtap.spec
View File

@ -1,5 +1,5 @@
# Release number for rpm build. Stays at 1 for new PACKAGE_VERSION increases.
%define release 5
%define release 6
# Version number of oldest elfutils release that works with systemtap.
%define elfutils_version 0.131
@ -45,8 +45,8 @@ Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz
Patch100: systemtap-0.6.1-gcc43.diff
Patch101: systemtap-0.6.1-elfi.diff
Patch100: systemtap-0.6.1-gcc43.patch
Patch101: systemtap-0.6.1-elfi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)