OBS User unknown 2008-06-25 21:56:44 +00:00 committed by Git OBS Bridge
parent e288e9837b
commit a9c66641d5
6 changed files with 57 additions and 8 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1a20a6e7d94c605b555744f08a80071b27ea54c84bd664cba18a56241be03a42
size 850218

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b4c34787ec1356ff3741f79fb7d70bf24ba9504739604eb8227c7a68489461e
size 863151

14
systemtap-i386-fix.diff Normal file
View File

@ -0,0 +1,14 @@
--- buildrun.cxx-dist 2008-06-20 15:20:32.000000000 +0200
+++ buildrun.cxx 2008-06-20 15:22:12.000000000 +0200
@@ -78,8 +78,10 @@ compile_pass (systemtap_session& s)
if (s.verbose > 3)
superverbose = "set -x;";
+ // fix -I in KBUILD_CFLAGS
+ o << "_KBUILD_CFLAGS = $(call flags,KBUILD_CFLAGS)" << endl;
o << "stap_check_gcc = $(shell " << superverbose << " if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo \"$(1)\"; else echo \"$(2)\"; fi)" << endl;
- o << "stap_check_build = $(shell " << superverbose << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null 2>&1 ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
+ o << "stap_check_build = $(shell " << superverbose << " if $(CC) $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(_KBUILD_CFLAGS) $(CFLAGS_KERNEL) $(EXTRA_CFLAGS) $(CFLAGS) -DKBUILD_BASENAME=\\\"" << s.module_name << "\\\" -Werror -S -o /dev/null -xc $(1) > /dev/null 2>&1 ; then echo \"$(2)\"; else echo \"$(3)\"; fi)" << endl;
o << "SYSTEMTAP_RUNTIME = \"" << s.runtime_path << "\"" << endl;

View File

@ -0,0 +1,11 @@
--- translate.cxx-dist 2008-06-20 15:41:33.000000000 +0200
+++ translate.cxx 2008-06-20 15:41:49.000000000 +0200
@@ -4530,7 +4530,7 @@ translate_pass (systemtap_session& s)
s.op->newline() << "#include <linux/utsrelease.h>";
s.op->newline() << "#include <linux/utsname.h>";
s.op->newline() << "#include <linux/version.h>";
- s.op->newline() << "#include <linux/compile.h>";
+ // s.op->newline() << "#include <linux/compile.h>";
s.op->newline() << "#include \"loc2c-runtime.h\" ";
// XXX: old 2.6 kernel hack

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jun 20 15:58:30 CEST 2008 - tiwai@suse.de
- fix run on i386 (bnc#401970)
- don't include obsolete linux/compile.h.
-------------------------------------------------------------------
Wed Jun 18 16:04:01 CEST 2008 - tiwai@suse.de
- updated to snapshot 20080614:
* bump to version 0.7, man page updates, misc fixes
see ChangeLog for details
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 14 14:15:17 CET 2008 - tiwai@suse.de Fri Mar 14 14:15:17 CET 2008 - tiwai@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package systemtap (Version 0.6) # spec file for package systemtap (Version 0.7)
# #
# Copyright (c) 2008 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 # This file and all modifications and additions to the pristine
@ -13,16 +13,18 @@
Name: systemtap Name: systemtap
BuildRequires: gcc-c++ glib2-devel libcap-devel libebl-devel pkg-config sqlite-devel BuildRequires: gcc-c++ glib2-devel libcap-devel libebl-devel pkg-config sqlite-devel
%define package_version 20080308 %define package_version 20080614
License: GPL v2 or later License: GPL v2 or later
Version: 0.6 Version: 0.7
Release: 40 Release: 1
Summary: Instrumentation System Summary: Instrumentation System
Group: Development/Tools/Debuggers Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/ Url: http://sourceware.org/systemtap/
# Requires: kernel-source gcc make # Requires: kernel-source gcc make
# Suggest: kernel-smp-debuginfo # Suggest: kernel-smp-debuginfo
Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2 Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2
Patch: systemtap-i386-fix.diff
Patch1: systemtap-no-linux-compile-h.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -42,10 +44,12 @@ Authors:
%prep %prep
# %setup -n %{name}-%{package_version} -q -a1 # %setup -n %{name}-%{package_version} -q -a1
%setup -n src -q %setup -n src -q
%patch
%patch1
%build %build
%configure %configure
make make %{?jobs:-j %jobs}
%install %install
%makeinstall %makeinstall
@ -64,6 +68,13 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %attr(0755,root,root) /var/cache/systemtap %dir %attr(0755,root,root) /var/cache/systemtap
%changelog %changelog
* Fri Jun 20 2008 tiwai@suse.de
- fix run on i386 (bnc#401970)
- don't include obsolete linux/compile.h.
* Wed Jun 18 2008 tiwai@suse.de
- updated to snapshot 20080614:
* bump to version 0.7, man page updates, misc fixes
see ChangeLog for details
* Fri Mar 14 2008 tiwai@suse.de * Fri Mar 14 2008 tiwai@suse.de
- updated to snapshot 20080308: - updated to snapshot 20080308:
* configure fixes, compile option changes * configure fixes, compile option changes