--- systemtap-0.0.20061028.orig/debian/changelog +++ systemtap-0.0.20061028/debian/changelog @@ -0,0 +1,141 @@ +systemtap (0.0.20061028-2) unstable; urgency=medium + + * Update debian/copyright + + -- Eugeniy Meshcheryakov Sat, 28 Oct 2006 19:46:57 +0200 + +systemtap (0.0.20061028-1) unstable; urgency=medium + + * New upstream snapshot + * Remove patches (fixed/applied upstream): + - 12-missing-manpages + - 14-mysql-enable + * Remove patch (not needed with current version of libpfm3-dev) + - 11-perfmon-includes (closes: #395484) + * Do not compile systemtap with perfmon support until it becames less + RC-buggy + - comment out part of debian/rules that enables perfmon support + - move patches needed for perfmon support to debian/patches.disabled + * 10-perfmon-autoconf + * 13-perfmon-link + * 15-perfmon-api-change + - do not build-depend on libpfm3-dev + * Do not compress examples + * Urgency "medium" because of fix for RC bug 395484 + + -- Eugeniy Meshcheryakov Sat, 28 Oct 2006 19:02:24 +0200 + +systemtap (0.0.20061014-1) unstable; urgency=low + + * New upstream shapshot + * Build-depend on libmysqlclient15-dev to enable mysql support for lket-b2a + * Update lket-b2a (1) manpage + + -- Eugeniy Meshcheryakov Sat, 14 Oct 2006 19:21:08 +0200 + +systemtap (0.0.20060930-1) unstable; urgency=low + + * New upstream snapshot + - stapd binary do not exist anymore, it was replaced with staprun program + * Added NEWS.Debian with instructions how to adjust /etc/sudoers for this + version + * s/stapd/staprun/ in README.Debian + * Removed debian/TODO, README.Debian now contains information from it + * Added lket-b2a (1) manual page + + -- Eugeniy Meshcheryakov Sun, 1 Oct 2006 20:21:11 +0200 + +systemtap (0.0.20060916-1) unstable; urgency=low + + * New upstream snapshot + * Enabled perfmon2 support for ia64 and i386 + + -- Eugeniy Meshcheryakov Sun, 17 Sep 2006 18:45:15 +0200 + +systemtap (0.0.20060909-1) unstable; urgency=low + + * New upstream snapshot + * Added script for creating packages for new upstream versions (to be used + with uscan) + * Fixed path to stpd in stap(1) manpage + + -- Eugeniy Meshcheryakov Sat, 9 Sep 2006 23:42:30 +0200 + +systemtap (0.0.20060902-1) unstable; urgency=low + + * New upstream snapshot + + -- Eugeniy Meshcheryakov Sat, 2 Sep 2006 17:20:03 +0200 + +systemtap (0.0.20060826-1) unstable; urgency=low + + * New upstream snapshot + * Removed patches (applied upstream): + - 03-systemtap-manpages + - 08-string-const-to-charp-fix + + -- Eugeniy Meshcheryakov Wed, 30 Aug 2006 11:20:39 +0200 + +systemtap (0.0.20060819-1) unstable; urgency=low + + * New upstream snapshot + * Added watch file + * Fixed FTBFS with gcc-4.2, thanks to Martin Michlmayr for reporting + (closes:#383780) + * Updated README.Debian + * Build-depend on elfutils libraries with version >= 0.123 as upstream does + + -- Eugeniy Meshcheryakov Sat, 19 Aug 2006 18:17:58 +0200 + +systemtap (0.0.20060812-1) unstable; urgency=low + + * New upstream snapshot + * debian/copyright - updated + * defined MAP_POPULATE for sparc in librelay.c to fix FTBFS + + -- Eugeniy Meshcheryakov Sat, 12 Aug 2006 18:27:20 +0200 + +systemtap (0.0.20060805-1) unstable; urgency=low + + * New upstream shapshot + * Removed elfutils sources from the package, there are now separate packages + in the archive; build system adjusted + + -- Eugeniy Meshcheryakov Mon, 7 Aug 2006 19:39:16 +0200 + +systemtap (0.0.20060722-2) unstable; urgency=low + + * Fixed incorrect usage of bswap_32 macro that caused FTBFS on m68k + + -- Eugeniy Meshcheryakov Wed, 26 Jul 2006 13:59:17 +0200 + +systemtap (0.0.20060722-1) unstable; urgency=low + + * New upstream snapshot + * New upstream version of elfutils (0.122) + * Added README.Debian with usage instructions + - added note that systemtap cannot be used with kernels compiled by + gcc-4.0 due to bug 378628 (closes: #378621) + + -- Eugeniy Meshcheryakov Mon, 24 Jul 2006 01:50:51 +0200 + +systemtap (0.0.20060701-1) unstable; urgency=low + + * New upstream snapshot + + -- Eugeniy Meshcheryakov Thu, 6 Jul 2006 11:43:41 +0200 + +systemtap (0.0.20060610-1) unstable; urgency=low + + * New upstream snapshot + * New upstream version of elfutils (0.121) + * Fixed (hopefully) FTBFS on most architectures + + -- Eugeniy Meshcheryakov Sat, 17 Jun 2006 01:00:53 +0300 + +systemtap (0.0.20060513-1) unstable; urgency=low + + * Initial release Closes: #338174 + + -- Eugeniy Meshcheryakov Tue, 16 May 2006 21:29:25 +0300 + --- systemtap-0.0.20061028.orig/debian/compat +++ systemtap-0.0.20061028/debian/compat @@ -0,0 +1 @@ +5 --- systemtap-0.0.20061028.orig/debian/patches/06-static-libdw-fix +++ systemtap-0.0.20061028/debian/patches/06-static-libdw-fix @@ -0,0 +1,17 @@ +diff -ruN src-old/configure.ac src/configure.ac +--- src-old/configure.ac 2006-07-20 00:12:10.000000000 +0200 ++++ src/configure.ac 2006-08-07 20:53:28.000000000 +0200 +@@ -41,12 +41,7 @@ + fi + + if test $build_elfutils = no; then +- # Need libdwfl-capable recent elfutils from Fedora +- save_LIBS="$LIBS" +- AC_CHECK_LIB(dw, dwfl_module_getsym,,[ +- AC_MSG_ERROR([systemtap requires elfutils 0.122+])]) +- stap_LIBS="$LIBS" +- LIBS="$SAVE_LIBS" ++ stap_LIBS="-lelf -Wl,--start-group -ldw -lebl -Wl,--end-group" + else + # We built our own and stap_LDFLAGS points at the install. + stap_LIBS=-ldw --- systemtap-0.0.20061028.orig/debian/patches/07-MAP_POPULATE-sparc +++ systemtap-0.0.20061028/debian/patches/07-MAP_POPULATE-sparc @@ -0,0 +1,15 @@ +diff -ruN src-old/runtime/stpd/librelay.c src/runtime/stpd/librelay.c +--- src-old/runtime/stpd/librelay.c 2006-07-20 20:13:46.000000000 +0200 ++++ src/runtime/stpd/librelay.c 2006-08-12 18:27:07.000000000 +0200 +@@ -217,6 +217,11 @@ + } + + total_bufsize = params.subbuf_size * params.n_subbufs; ++#ifdef __sparc__ ++#ifndef MAP_POPULATE ++#define MAP_POPULATE 0x8000 ++#endif ++#endif + relay_buffer[cpu] = mmap(NULL, total_bufsize, PROT_READ, + MAP_PRIVATE | MAP_POPULATE, relay_file[cpu], + 0); --- systemtap-0.0.20061028.orig/debian/patches/03-systemtap-manpages +++ systemtap-0.0.20061028/debian/patches/03-systemtap-manpages @@ -0,0 +1,198 @@ +diff -ruN src-old/lket.5.in src/lket.5.in +--- src-old/lket.5.in 2006-10-24 09:53:57.000000000 +0200 ++++ src/lket.5.in 2006-10-28 18:58:20.000000000 +0200 +@@ -1418,4 +1418,4 @@ + + .SH SEE ALSO + .IR stap (1) +-.IR lket-b2a (5) ++.IR lket\-b2a (5) +diff -ruN src-old/lket-b2a.1.in src/lket-b2a.1.in +--- src-old/lket-b2a.1.in 2006-10-23 11:50:57.000000000 +0200 ++++ src/lket-b2a.1.in 2006-10-28 18:57:24.000000000 +0200 +@@ -1,7 +1,7 @@ + .\" -*- nroff -*- + .TH LKET-B2A 1 @DATE@ "IBM" + .SH NAME +-lket-b2a \- Converting and dumping utility for LKET binary trace data ++lket\-b2a \- Converting and dumping utility for LKET binary trace data + + .\" macros + .de SAMPLE +@@ -19,7 +19,7 @@ + .SH SYNOPSIS + + .br +-.B lket-b2a ++.B lket\-b2a + .I OPTIONS + .IR IN_FILENAME ... + .br +@@ -30,22 +30,22 @@ + .I LKET + is in binary format by default for + better performance and smaller size. +-.I lket-b2a ++.I lket\-b2a + is used to convert the + binary trace data into readable data in ascii format and save + them into local file or MySQL database for off-line trace analysis. + It uses the per-cpu binary trace data files (stpd_cpu*) as inputs. +-You can use "stap -bM" with LKET to get those per-cpu files before using it. ++You can use "stap \-bM" with LKET to get those per-cpu files before using it. + + The database used by +-.I lket-b2a ++.I lket\-b2a + is MySQL. So MySQL must be properly installed + and configured in order to make +-.I lket-b2a ++.I lket\-b2a + able to dump the trace data into MySQL database. + + .SH OPTIONS +-.I lket-b2a ++.I lket\-b2a + supports the following two options. They can be used + together or alone but at least one of them should be specified: + +@@ -65,7 +65,7 @@ + The following is an example: + + .SAMPLE +-root:/home/root/data> lket-b2a -f stpd_cpu* ++root:/home/root/data> lket\-b2a \-f stpd_cpu* + root:/home/root/data> cat lket.out + LKET Magic: 0xAEFCDB6B + InitHdrLen: 9 +@@ -90,28 +90,28 @@ + To avoid either reading the complete trace data into internal data + structures to process, or filter through the raw trace data again + and again to calculate the interesting metrics, +-.I lket-b2a ++.I lket\-b2a + supports convert and save the binary trace data into MySQL database to + facilitate the query and calculation on the trace data. + +-.I lket-b2a ++.I lket\-b2a + creates the database name based on current time. And +-.I lket-b2a ++.I lket\-b2a + will not only save the trace data, but also some meta data into MySQL + database too, such as trace header, trace table description. + + The following is an example of navigating the trace data in MySQL database + created by +-.IR lket-b2a : ++.IR lket\-b2a : + + Use +-.I lket-b2a ++.I lket\-b2a + to convert and dump the binary trace data of + .I LKET + into MySQL database: + + .SAMPLE +-root:/home/root/data> lket-b2a -m stpd_cpu* ++root:/home/root/data> lket\-b2a \-m stpd_cpu* + .ESAMPLE + + list all databases in MySQL: +@@ -128,7 +128,7 @@ + 3 rows in set (0.00 sec) + .ESAMPLE + +-DB20061023161626 is the newly created database by "lket-b2a -m stpd_cpu*". We can list ++DB20061023161626 is the newly created database by "lket\-b2a \-m stpd_cpu*". We can list + all the tables contained in DB20061023161626: + + .SAMPLE +@@ -226,7 +226,7 @@ + for all return type event tables which is the timestamp + of the entry of that event. The column + .I entry_usec +-is created and calculated by lket-b2a on the fly while processing the binary trace data. ++is created and calculated by lket\-b2a on the fly while processing the binary trace data. + + .SAMPLE + mysql> select * from 2_1 limit 4; +diff -ruN src-old/man/stapprobes.nfs.5.in src/man/stapprobes.nfs.5.in +--- src-old/man/stapprobes.nfs.5.in 2006-09-29 11:12:16.000000000 +0200 ++++ src/man/stapprobes.nfs.5.in 2006-10-28 18:55:03.000000000 +0200 +@@ -199,7 +199,7 @@ + how long the cached information is assumed to be valid. + + The cached attrs for this inode needed to be revalidated if +- jiffies - read_cache_jiffies > attrtime ++ jiffies \- read_cache_jiffies > attrtime + + .P + .TP +@@ -305,7 +305,7 @@ + how long the cached information is assumed to be valid. + + The cached attrs for this inode needed to be revalidated if +- jiffies - read_cache_jiffies > attrtime ++ jiffies \- read_cache_jiffies > attrtime + + .P + .TP +@@ -488,7 +488,7 @@ + how long the cached information is assumed to be valid. + + The cached attrs for this inode needed to be revalidated if +- jiffies - read_cache_jiffies > attrtime ++ jiffies \- read_cache_jiffies > attrtime + + .P + .TP +@@ -798,7 +798,7 @@ + nfs version + + .I flags +- used to set task->tk_flags in rpc_init_task function ++ used to set task\->tk_flags in rpc_init_task function + + .I size,count + number of bytes to be read in this execution +@@ -835,7 +835,7 @@ + nfs version + + .I flags +- used to set task->tk_flags in rpc_init_task function ++ used to set task\->tk_flags in rpc_init_task function + + .I size,count + number of bytes to be written in this execution +@@ -1008,7 +1008,7 @@ + result of last async write operation + + .I valid +- fattr->valid ,indicates which fields are valid ++ fattr\->valid ,indicates which fields are valid + + .I count + number of bytes written +@@ -1068,7 +1068,7 @@ + result of last async write operation + + .I valid +- fattr->valid ,indicates which fields are valid ++ fattr\->valid ,indicates which fields are valid + + .I count + number of bytes written +diff -ruN src-old/man/stapprobes.nfsd.5.in src/man/stapprobes.nfsd.5.in +--- src-old/man/stapprobes.nfsd.5.in 2006-09-29 11:12:16.000000000 +0200 ++++ src/man/stapprobes.nfsd.5.in 2006-10-28 18:55:03.000000000 +0200 +@@ -118,7 +118,7 @@ + number of blocks to written + + .I stable +- argp->stable(only for nfs.proc3.write) ++ argp\->stable(only for nfs.proc3.write) + + .P + .TP --- systemtap-0.0.20061028.orig/debian/repack +++ systemtap-0.0.20061028/debian/repack @@ -0,0 +1,19 @@ +#! /bin/sh + +set -e + +if test ! $# = 3; then exit 1; fi + +new_version="$2" +symlink="$3" + +tarball=`readlink "$symlink"` + +rm "$symlink" +rm -rf "../systemtap-${new_version}" +mkdir "../systemtap-${new_version}" +mv "../$tarball" "../systemtap-${new_version}/" +GZIP=-9 tar -czC ../ -f "../systemtap-${new_version}.tar.gz" "systemtap-${new_version}" +rm -rf "../systemtap-${new_version}" + +uupdate -v "$new_version" "../systemtap-${new_version}.tar.gz" --- systemtap-0.0.20061028.orig/debian/rules +++ systemtap-0.0.20061028/debian/rules @@ -0,0 +1,84 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dbs/dbs-build.mk +ifeq (,$(DEB_BUILD_GNU_TYPE)) + include /usr/share/dbs/dpkg-arch.mk +endif +ifeq (,$(DEB_HOST_ARCH)) + DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) +endif + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +STAP_BUILD=$(BUILD_TREE)/src + +CONF_FLAGS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \ + --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --libdir=\$${prefix}/lib --libexecdir=\$${prefix}/lib + +# Uncomment this if you want perfmon support. Also move patches from debian/patches.disabled +# to debian/patches + +#ifneq (,$(findstring :$(DEB_HOST_ARCH):,:ia64:i386:)) +# CONF_FLAGS += --enable-perfmon +#endif + +configure: configure-stamp +configure-stamp: $(patched) + dh_testdir + cd $(STAP_BUILD) && aclocal-1.9 + cd $(STAP_BUILD) && autoconf --force -i + cd $(STAP_BUILD) && automake-1.9 + cd $(STAP_BUILD) && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure $(CONF_FLAGS) + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + cd $(STAP_BUILD) && $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + rm -rf $(STAMP_DIR) $(SOURCE_DIR) + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + cd $(STAP_BUILD) && $(MAKE) install DESTDIR=$(CURDIR)/debian/systemtap + rm -rf debian/systemtap/usr/share/systemtap/runtime/relayfs + +binary-indep: install + +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs $(STAP_BUILD)/ChangeLog + dh_installdocs + dh_installman + dh_installexamples + dh_link + dh_strip + dh_compress -Xexamples + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build configure clean binary-indep binary-arch binary install --- systemtap-0.0.20061028.orig/debian/watch +++ systemtap-0.0.20061028/debian/watch @@ -0,0 +1,2 @@ +version=3 +opts=uversionmangle=s/^(.*)$/0\.0\.$1/ ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-(\d+)\.tar.bz2 debian /bin/sh debian/repack --- systemtap-0.0.20061028.orig/debian/docs +++ systemtap-0.0.20061028/debian/docs @@ -0,0 +1,3 @@ +build-tree/src/README +build-tree/src/HACKING +build-tree/src/INTERNALS --- systemtap-0.0.20061028.orig/debian/control +++ systemtap-0.0.20061028/debian/control @@ -0,0 +1,17 @@ +Source: systemtap +Section: devel +Priority: optional +Maintainer: Eugeniy Meshcheryakov +Build-Depends: debhelper (>= 5.0.0), dbs, autoconf, automake1.9, bzip2, libglib2.0-dev, libelf-dev (>= 0.123), libdw-dev (>= 0.123), libebl-dev (>= 0.123), libmysqlclient15-dev +Build-Conflicts: autoconf2.13, automake1.4 +Standards-Version: 3.7.2 + +Package: systemtap +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, sudo +Description: instrumentation system for Linux 2.6 + The SystemTap project aims to produce a Linux tool that lets + application developers and system administrators take a deeper look + into a running kernel. It aims to exploit the capability of a fully + open-source Linux target to go beyond performance measurements, and + perhaps even serve as a programmable debugger. --- systemtap-0.0.20061028.orig/debian/copyright +++ systemtap-0.0.20061028/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Eugeniy Meshcheryakov on +Wed, 17 May 2006 01:01:20 +0300. + +systemtap source code was downloaded from ftp://sources.redhat.com/pub/systemtap/snapshots/ + +Upstream Authors: + Frank Ch. Eigler + Graydon Hoare + Martin Hunt + Tom Zanussi + +Copyright: + 1998 - 2006 Red Hat, Inc + 2005, 2006 Intel Corporation + 2002 - 2005 Tom Zanussi (zanussi@us.ibm.com), IBM Corp + 1999 - 2005 Karim Yaghmour (karim@opersys.com) + 2005, 2006 IBM Corporation + 1991, 1992, 2002 Linus Torvalds + 1997 - 1998, 2002 Andrew Tridgell + +License: + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by the + Free Software Foundation; version 2 of the License. + + Red Hat elfutils is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with Red Hat elfutils; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. + +On Debian systems, the complete text of the GNU General Public +License, version 2, can be found in /usr/share/common-licenses/GPL-2. + +The Debian packaging is (C) 2006, Eugeniy Meshcheryakov and +is licensed under the GPL, see above. --- systemtap-0.0.20061028.orig/debian/NEWS +++ systemtap-0.0.20061028/debian/NEWS @@ -0,0 +1,11 @@ +systemtap (0.0.20060930-1) unstable; urgency=low + + This version of systemtap does not contain stapd program anymore, it was + replaced by staprun program. You need to adjust your /etc/sudoers file + to be able to run systemtap as non-root. Please, replace references to + /usr/lib/systemtap/stapd with /usr/bin/staprun. New entry should look + like this: + + auser ALL=(root) /usr/bin/staprun + + -- Eugeniy Meshcheryakov Sun, 1 Oct 2006 20:54:05 +0200 --- systemtap-0.0.20061028.orig/debian/examples +++ systemtap-0.0.20061028/debian/examples @@ -0,0 +1,3 @@ +build-tree/src/examples/small_demos/*.stp +build-tree/src/examples/small_demos/*.txt +build-tree/src/examples/small_demos/*.wav --- systemtap-0.0.20061028.orig/debian/README.Debian +++ systemtap-0.0.20061028/debian/README.Debian @@ -0,0 +1,28 @@ +systemtap for Debian +==================== + +Currently Debian kernels do not contain debugging information, so it is +not possible to use systemtap with those kernels. It is however possible +to use systemtap on custom kernels. To compile kernel with included +debugging information option CONFIG_DEBUG_INFO should be enabled during +kernel configuration (it is available under menu "Kernel hacking", +"Compile the kernel with debug info"). You also should enable kprobes +(CONFIG_KPROBES) in kernel config, this option is located under +"Instrumentation support" menu and it is marked as EXPERIMENTAL. systemtap +also requires ELF image of the running kernel (vmlinux), you can copy it +to /boot manually or, if you are using kernel-package, you can add option +'install_vmlinux = YES' into /etc/kernel-pkg.conf . + +To use systemtap as normal user you may want to modify /etc/sudoers file +to allow some users to execute 'staprun' as root. To do so run 'visudo' and +add a line like this: + +auser ALL=(root) /usr/bin/staprun + +(replace 'auser' with needed user name here). + +NOTE: gcc-4.0 contains bug (#378628) that makes impossible to use +systemtap with kernels compiled by that compiler. Please, until that +bug is fixed, use other versions of gcc. + + -- Eugeniy Meshcheryakov Sun, 1 Oct 2006 17:34:26 +0200 --- systemtap-0.0.20061028.orig/debian/patches.disabled/15-perfmon-api-change +++ systemtap-0.0.20061028/debian/patches.disabled/15-perfmon-api-change @@ -0,0 +1,27 @@ +diff -ruN src-old/tapsets.cxx src/tapsets.cxx +--- src-old/tapsets.cxx 2006-10-24 16:55:24.000000000 +0200 ++++ src/tapsets.cxx 2006-10-28 18:16:22.000000000 +0200 +@@ -5294,10 +5294,10 @@ + for (unsigned i=0; ievent == "cycles") { +- if (pfm_get_cycle_event( &inp.pfp_events[i].event) != PFMLIB_SUCCESS) ++ if (pfm_get_cycle_event( &inp.pfp_events[i]) != PFMLIB_SUCCESS) + no_pfm_event_error(probes[i]->event); + } else if (probes[i]->event == "instructions") { +- if (pfm_get_inst_retired_event( &inp.pfp_events[i].event) != ++ if (pfm_get_inst_retired_event( &inp.pfp_events[i]) != + PFMLIB_SUCCESS) + no_pfm_event_error(probes[i]->event); + } else { +@@ -5357,9 +5357,7 @@ + * Figure out the actual pmds to use. + */ + for (unsigned i=0, j=0; i < inp.pfp_event_count; i++) { +- pd[i].reg_num = outp.pfp_pmcs[j].reg_pmd_num; +- for(; j < outp.pfp_pmc_count; j++) +- if (outp.pfp_pmcs[j].reg_evt_idx != i) break; ++ pd[i].reg_num = outp.pfp_pmds[j].reg_num; + } + + // Output the be probes create function --- systemtap-0.0.20061028.orig/debian/patches.disabled/13-perfmon-link +++ systemtap-0.0.20061028/debian/patches.disabled/13-perfmon-link @@ -0,0 +1,39 @@ +diff -ruN src-old/configure.ac src/configure.ac +--- src-old/configure.ac 2006-10-28 16:57:15.000000000 +0200 ++++ src/configure.ac 2006-10-28 16:57:15.000000000 +0200 +@@ -40,13 +40,16 @@ + + dnl XXX fixme so that it it can use perfmon installed for real + dnl check that perfmon libraries are actually there ++AC_SUBST(PFM_CPPFLAGS) ++AC_SUBST(PFM_LDFLAGS) ++save_LIBS=$LIBS + if test $perfmon_support = yes; then + AC_CHECK_LIB(pfm3, pfm_start,,[ + AC_MSG_ERROR([systemtap cannot find required perfmon libs])]) +- CFLAGS="$CFLAGS -DPERFMON -I$with_perfmon/include" +- CXXFLAGS="$CXXFLAGS -DPERFMON -I$with_perfmon/include" +- LDFLAGS="$LDFLAGS -DPERFMON -L$with_perfmon/lib -lpfm3" ++ PFM_CPPFLAGS="-DPERFMON" ++ PFM_LDFLAGS="-lpfm3" + fi ++LIBS=$save_LIBS + + build_elfutils=no + AC_ARG_WITH([elfutils], +diff -ruN src-old/Makefile.am src/Makefile.am +--- src-old/Makefile.am 2006-10-24 00:09:51.000000000 +0200 ++++ src/Makefile.am 2006-10-28 16:59:17.000000000 +0200 +@@ -17,10 +17,10 @@ + parse.cxx staptree.cxx elaborate.cxx translate.cxx \ + tapsets.cxx buildrun.cxx loc2c.c hash.cxx mdfour.c \ + cache.cxx util.cxx +-stap_LDADD = @stap_LIBS@ ++stap_LDADD = @stap_LIBS@ @PFM_LDFLAGS@ + + stap_CXXFLAGS = -Werror $(AM_CXXFLAGS) +-stap_CPPFLAGS = $(AM_CPPFLAGS) ++stap_CPPFLAGS = $(AM_CPPFLAGS) @PFM_CPPFLAGS@ + stap_LDFLAGS = $(AM_LDFLAGS) + + CLEANFILES = --- systemtap-0.0.20061028.orig/debian/patches.disabled/10-perfmon-autoconf +++ systemtap-0.0.20061028/debian/patches.disabled/10-perfmon-autoconf @@ -0,0 +1,17 @@ +diff -ruN src-old/configure.ac src/configure.ac +--- src-old/configure.ac 2006-09-17 18:05:20.000000000 +0200 ++++ src/configure.ac 2006-09-17 18:06:27.000000000 +0200 +@@ -41,11 +41,11 @@ + dnl XXX fixme so that it it can use perfmon installed for real + dnl check that perfmon libraries are actually there + if test $perfmon_support = yes; then +- AC_CHECK_LIB(pfm, pfm_start,,[ ++ AC_CHECK_LIB(pfm3, pfm_start,,[ + AC_MSG_ERROR([systemtap cannot find required perfmon libs])]) + CFLAGS="$CFLAGS -DPERFMON -I$with_perfmon/include" + CXXFLAGS="$CXXFLAGS -DPERFMON -I$with_perfmon/include" +- LDFLAGS="$LDFLAGS -DPERFMON -L$with_perfmon/lib -lpfm" ++ LDFLAGS="$LDFLAGS -DPERFMON -L$with_perfmon/lib -lpfm3" + fi + + build_elfutils=no