diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2009-07-25 20:45:49 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2009-07-25 20:45:49 +0000 |
| commit | bcedeaaabb89cdcf2d93b9bf8eef0a08d37de4ce (patch) | |
| tree | 5b0f928ffe5f3bd2698db26bb23336fe785896fb /dev-java | |
| parent | Fix building with GCC 4.4 wrt #273159. (diff) | |
| download | gentoo-2-bcedeaaabb89cdcf2d93b9bf8eef0a08d37de4ce.tar.gz gentoo-2-bcedeaaabb89cdcf2d93b9bf8eef0a08d37de4ce.tar.bz2 gentoo-2-bcedeaaabb89cdcf2d93b9bf8eef0a08d37de4ce.zip | |
Fix compilation with gcc-4.4; bug #273839
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jmp/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/jmp/files/jmp-0.51-gcc44.patch | 13 | ||||
| -rw-r--r-- | dev-java/jmp/jmp-0.51.ebuild | 13 |
3 files changed, 29 insertions, 5 deletions
diff --git a/dev-java/jmp/ChangeLog b/dev-java/jmp/ChangeLog index 7bfe19471f75..b226cadcc253 100644 --- a/dev-java/jmp/ChangeLog +++ b/dev-java/jmp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jmp -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jmp/ChangeLog,v 1.18 2007/11/28 03:18:04 betelgeuse Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jmp/ChangeLog,v 1.19 2009/07/25 20:45:49 halcy0n Exp $ + + 25 Jul 2009; Mark Loeser <halcy0n@gentoo.org> jmp-0.51.ebuild, + +files/jmp-0.51-gcc44.patch: + Fix compilation with gcc-4.4; bug #273839 28 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> jmp-0.51.ebuild: Prefer 1.5 over 1.4. diff --git a/dev-java/jmp/files/jmp-0.51-gcc44.patch b/dev-java/jmp/files/jmp-0.51-gcc44.patch new file mode 100644 index 000000000000..239d025dcbf9 --- /dev/null +++ b/dev-java/jmp/files/jmp-0.51-gcc44.patch @@ -0,0 +1,13 @@ +diff -ur jmp-0.51-orig/jmp.c jmp-0.51/jmp.c +--- jmp-0.51-orig/jmp.c 2009-07-25 16:39:20.000000000 -0400 ++++ jmp-0.51/jmp.c 2009-07-25 16:41:29.000000000 -0400 +@@ -167,7 +167,7 @@ + + #ifdef JVMPI_VERSION_1_2 + static jint jvmpi_version_supported = JVMPI_VERSION_1_2; +-#elif JVMPI_VERSION_1_1 ++#elif defined(JVMPI_VERSION_1_1) + static jint jvmpi_version_supported = JVMPI_VERSION_1_1; + #else + static jint jvmpi_version_supported = JVMPI_VERSION_1; + diff --git a/dev-java/jmp/jmp-0.51.ebuild b/dev-java/jmp/jmp-0.51.ebuild index 2a78e3a27465..9613738041c3 100644 --- a/dev-java/jmp/jmp-0.51.ebuild +++ b/dev-java/jmp/jmp-0.51.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jmp/jmp-0.51.ebuild,v 1.6 2007/11/28 03:18:04 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jmp/jmp-0.51.ebuild,v 1.7 2009/07/25 20:45:49 halcy0n Exp $ -inherit java-pkg-2 +inherit eutils java-pkg-2 DESCRIPTION="Java Memory Profiler" HOMEPAGE="http://www.khelekore.org/jmp/" @@ -28,6 +28,13 @@ RDEPEND="|| ( =virtual/jre-1.5* =virtual/jre-1.4* ) DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) ${RDEPEND}" +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${P}-gcc44.patch +} + src_compile() { econf $(use_enable !gtk noui) || die "econf ${myconf} failed" emake || die "emake failed" |