diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2009-02-04 22:29:26 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2009-02-04 22:29:26 +0000 |
| commit | 6def2b36af2bf7a83039464f496f7cdeaa4df5a8 (patch) | |
| tree | 6cc8462a546adf2a0aa21d90a34344d58ef05eee /dev-util/systemtap | |
| parent | arm/ia64/s390/sh/sparc stable wrt #256173 (diff) | |
| download | gentoo-2-6def2b36af2bf7a83039464f496f7cdeaa4df5a8.tar.gz gentoo-2-6def2b36af2bf7a83039464f496f7cdeaa4df5a8.tar.bz2 gentoo-2-6def2b36af2bf7a83039464f496f7cdeaa4df5a8.zip | |
Adjust elfutils dependency. Fix gcc 4.3.3 warnings, bug #257287.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/systemtap')
| -rw-r--r-- | dev-util/systemtap/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/systemtap/files/systemtap-0.8-gcc-4.3.3-warnings.patch | 35 | ||||
| -rw-r--r-- | dev-util/systemtap/systemtap-0.8.ebuild | 5 |
3 files changed, 43 insertions, 3 deletions
diff --git a/dev-util/systemtap/ChangeLog b/dev-util/systemtap/ChangeLog index c940f00118eb..3c9e2cb71b17 100644 --- a/dev-util/systemtap/ChangeLog +++ b/dev-util/systemtap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/systemtap # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.73 2009/01/30 21:41:16 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.74 2009/02/04 22:29:26 swegener Exp $ + + 04 Feb 2009; Sven Wegener <swegener@gentoo.org> + +files/systemtap-0.8-gcc-4.3.3-warnings.patch, systemtap-0.8.ebuild: + Adjust elfutils dependency. Fix gcc 4.3.3 warnings, bug #257287. *systemtap-0.8 (30 Jan 2009) diff --git a/dev-util/systemtap/files/systemtap-0.8-gcc-4.3.3-warnings.patch b/dev-util/systemtap/files/systemtap-0.8-gcc-4.3.3-warnings.patch new file mode 100644 index 000000000000..bcf294689608 --- /dev/null +++ b/dev-util/systemtap/files/systemtap-0.8-gcc-4.3.3-warnings.patch @@ -0,0 +1,35 @@ +diff --git a/tapsets.cxx b/tapsets.cxx +index c8742fb..1e44986 100644 +--- a/tapsets.cxx ++++ b/tapsets.cxx +@@ -2273,21 +2273,21 @@ struct dwflpp + FILE *memstream = open_memstream (&buf, &bufsz); + assert(memstream); + +- fprintf(memstream, "{\n"); +- fprintf(memstream, prelude.c_str()); ++ fputs("{\n", memstream); ++ fputs(prelude.c_str(), memstream); + bool deref = c_emit_location (memstream, head, 1); +- fprintf(memstream, postlude.c_str()); +- fprintf(memstream, " goto out;\n"); ++ fputs(postlude.c_str(), memstream); ++ fputs(" goto out;\n", memstream); + + // dummy use of deref_fault label, to disable warning if deref() not used +- fprintf(memstream, "if (0) goto deref_fault;\n"); ++ fputs("if (0) goto deref_fault;\n", memstream); + + // XXX: deref flag not reliable; emit fault label unconditionally + (void) deref; +- fprintf(memstream, +- "deref_fault:\n" +- " goto out;\n"); +- fprintf(memstream, "}\n"); ++ fputs("deref_fault:\n" ++ " goto out;\n", ++ memstream); ++ fputs("}\n", memstream); + + fclose (memstream); + string result(buf); diff --git a/dev-util/systemtap/systemtap-0.8.ebuild b/dev-util/systemtap/systemtap-0.8.ebuild index b0275eeecace..d1db08d2aab8 100644 --- a/dev-util/systemtap/systemtap-0.8.ebuild +++ b/dev-util/systemtap/systemtap-0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.8.ebuild,v 1.1 2009/01/30 21:41:16 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.8.ebuild,v 1.2 2009/02/04 22:29:26 swegener Exp $ inherit linux-info eutils @@ -22,7 +22,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="sqlite" -DEPEND=">=dev-libs/elfutils-0.122 +DEPEND=">=dev-libs/elfutils-0.131 sys-libs/libcap sqlite? ( =dev-db/sqlite-3* )" RDEPEND="${DEPEND} @@ -38,6 +38,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/systemtap-20080119-grsecurity.patch + epatch "${FILESDIR}"/${P}-gcc-4.3.3-warnings.patch } src_compile() { |