From 39ff8fe8c34c97c95d3d775a806d6e268f0a0839fb3dbdc5b9aecdea6a96840b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 12 Jan 2008 02:27:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=22 --- systemtap-20071117.tar.bz2 | 3 -- systemtap-20080105.tar.bz2 | 3 ++ systemtap-gcc43-fixes.diff | 80 +++++++++++++++++++++++++++++++------- systemtap.changes | 6 +++ systemtap.spec | 12 ++++-- 5 files changed, 82 insertions(+), 22 deletions(-) delete mode 100644 systemtap-20071117.tar.bz2 create mode 100644 systemtap-20080105.tar.bz2 diff --git a/systemtap-20071117.tar.bz2 b/systemtap-20071117.tar.bz2 deleted file mode 100644 index d419a99..0000000 --- a/systemtap-20071117.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46f6c64d50974f848b8520693711661aed3a9c16e25ba82cd3cd3ebf8d0bde13 -size 778423 diff --git a/systemtap-20080105.tar.bz2 b/systemtap-20080105.tar.bz2 new file mode 100644 index 0000000..d0ced53 --- /dev/null +++ b/systemtap-20080105.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e85009c7c22d319a6ce4d727c793fe14c77faa1766b6aec5acfedee81115ac8 +size 779519 diff --git a/systemtap-gcc43-fixes.diff b/systemtap-gcc43-fixes.diff index f3556c2..55a3986 100644 --- a/systemtap-gcc43-fixes.diff +++ b/systemtap-gcc43-fixes.diff @@ -1,21 +1,71 @@ ---- staptree.h-dist 2007-10-24 16:27:33.000000000 +0200 -+++ staptree.h 2007-10-24 16:27:56.000000000 +0200 -@@ -844,7 +844,7 @@ require (deep_copy_visitor* v, T* dst, T +diff -ruN src-old/staptree.cxx src/staptree.cxx +--- src-old/staptree.cxx 2007-12-11 14:45:28.000000000 +0100 ++++ src/staptree.cxx 2007-12-17 16:05:19.000000000 +0100 +@@ -2390,3 +2390,30 @@ + require (&v, &n, s); + return n; + } ++ ++template <> void ++require (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 (v, &array_dst, array_src); ++ *dst = array_dst; ++ } ++ else ++ { ++ require (v, &hist_dst, hist_src); ++ *dst = hist_dst; ++ } ++ assert (*dst); ++ } ++} ++ +diff -ruN src-old/staptree.h src/staptree.h +--- src-old/staptree.h 2007-12-11 14:45:29.000000000 +0100 ++++ src/staptree.h 2007-12-17 16:06:15.000000000 +0100 +@@ -848,31 +848,8 @@ } } -template <> static void +-require (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 (v, &array_dst, array_src); +- *dst = array_dst; +- } +- else +- { +- require (v, &hist_dst, hist_src); +- *dst = hist_dst; +- } +- assert (*dst); +- } +-} +template <> void - require (deep_copy_visitor* v, indexable** dst, indexable* src) - { - if (src != NULL) ---- staptree.cxx-dist 2007-10-24 16:27:29.000000000 +0200 -+++ staptree.cxx 2007-10-24 16:28:06.000000000 +0200 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - using namespace std; ++require (deep_copy_visitor* v, indexable** dst, indexable* src); + template void + provide (deep_copy_visitor* v, T src) diff --git a/systemtap.changes b/systemtap.changes index 046b96f..4831633 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 11 17:10:09 CET 2008 - tiwai@suse.de + +- updated to snapshot 20080105 +- fixed build of the snapshot with gcc 4.3 + ------------------------------------------------------------------- Mon Nov 19 14:53:53 CET 2007 - tiwai@suse.de diff --git a/systemtap.spec b/systemtap.spec index 882cc0b..7f9e912 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,7 +1,7 @@ # # spec file for package systemtap (Version 0.6) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,10 +12,10 @@ Name: systemtap BuildRequires: gcc-c++ glib2-devel libcap-devel libebl-devel pkg-config sqlite-devel -%define package_version 20071117 +%define package_version 20080105 License: GPL v2 or later Version: 0.6 -Release: 9 +Release: 18 Summary: Instrumentation System Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ @@ -43,7 +43,7 @@ Authors: # %setup -n %{name}-%{package_version} -q -a1 %setup -n src -q %if %suse_version > 1030 -%patch +%patch -p1 %endif %build @@ -65,7 +65,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/systemtap %{_datadir}/systemtap %dir %attr(0755,root,root) /var/cache/systemtap + %changelog +* Fri Jan 11 2008 - tiwai@suse.de +- updated to snapshot 20080105 +- fixed build of the snapshot with gcc 4.3 * Mon Nov 19 2007 - tiwai@suse.de - enable gcc-4.3 patch (yes, we use only gcc4.3 now) - updated to snapshot 20071117