[perl: 1/3] Added systemtap tapset and example to make use of systemtap-sdt-devel.
Marcela Mašláňová
mmaslano at fedoraproject.org
Wed Jan 26 15:20:09 UTC 2011
commit bbccd06ce4b4019a02b64df513848ec2aebf516d
Author: Lukas Berk <lberk at redhat.com>
Date: Wed Jan 26 16:11:57 2011 +0100
Added systemtap tapset and example to make use of systemtap-sdt-devel.
Signed-off-by: Marcela Mašláňová <mmaslano at redhat.com>
.gitignore | 2 ++
perl.spec | 28 +++++++++++++++++++++++++++-
sources | 2 ++
3 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 862a623..1937da7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ macros.perl
filter-requires.sh
/perl-5.12.2.tar.gz
/perl-5.12.3.tar.gz
+/perl.stp
+/perl-example.stp
diff --git a/perl.spec b/perl.spec
index a3c79af..adc17f7 100644
--- a/perl.spec
+++ b/perl.spec
@@ -5,6 +5,7 @@
%define multilib_64_archs x86_64 s390x ppc64 sparc64
%define parallel_tests 1
+%global tapsetdir /usr/share/systemtap/tapset
# internal filter just for this spec
%define perl_default_filter %{?filter_setup: %{expand: \
@@ -19,7 +20,7 @@
Name: perl
Version: %{perl_version}
# release number must be even higher, becase dual-lived modules will be broken otherwise
-Release: 148%{?dist}
+Release: 149%{?dist}
Epoch: %{perl_epoch}
Summary: Practical Extraction and Report Language
Group: Development/Languages
@@ -34,6 +35,10 @@ Url: http://www.perl.org/
Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.gz
Source2: perl-5.8.0-libnet.cfg
Source3: macros.perl
+#Systemtap tapset and example that make use of systemtap-sdt-devel
+# build requirement. Written by lberk; Not yet upstream.
+Source4: perl.stp
+Source5: perl-example.stp
# Removes date check, Fedora/RHEL specific
Patch1: perl-perlbug-tag.patch
@@ -915,6 +920,8 @@ tarball from perl.org.
%patch8 -p1
%patch9 -p1
+#copy the example script
+cp -a %{SOURCE5} .
#
# Candidates for doc recoding (need case by case review):
@@ -1154,6 +1161,19 @@ for package in Test-Simple; do
done
popd
+# Systemtap tapset install
+mkdir -p %{buildroot}%{tapsetdir}
+%ifarch %{multilib_64_archs}
+%global libperl_stp libperl%{perl_version}-64.stp
+%else
+%global libperl_stp libperl%{perl_version}-32.stp
+%endif
+
+sed \
+ -e "s|LIBRARY_PATH|%{archlib}/CORE/libperl.so|" \
+ %{SOURCE4} \
+ > %{buildroot}%{tapsetdir}/%{libperl_stp}
+
# TODO: Canonicalize test files (rewrite intrerpreter path, fix permissions)
# XXX: We cannot rewrite ./perl before %%check phase. Otherwise the test
# would run against system perl at build-time.
@@ -1522,6 +1542,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xsubpp*
%{_mandir}/man1/perlxs*
%attr(0644,root,root) %{_sysconfdir}/rpm/macros.perl
+%{tapsetdir}/%{libperl_stp}
+%doc perl-example.stp
%files tests
%defattr(-,root,root,-)
@@ -1869,6 +1891,10 @@ rm -rf $RPM_BUILD_ROOT
# Old changelog entries are preserved in CVS.
%changelog
+* Tue Jan 25 2011 Lukas Berk <lberk at redhat.com> - 4:5.12.3-149
+- added systemtap tapset to make use of systemtap-sdt-devel
+- added an example systemtap script
+
* Mon Jan 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 4:5.12.3-148
- stable update 5.12.3
- add COMPAT
diff --git a/sources b/sources
index f7d2165..986d98b 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,5 @@ aceea3db13a159cd5f7e5f2e3ad9534f perl-5.8.0-libdir64.patch
26be2f310eef77f206c47e380518cbd8 macros.perl
ad5d07285d6e4914384b43c9abc2bdba filter-requires.sh
29975a69dce54e47fcd6331c085c6c99 perl-5.12.3.tar.gz
+1737a36154bb5bca781296794afc6791 perl.stp
+df28fe2c574e8807d0a803308c545dca perl-example.stp
More information about the scm-commits
mailing list