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 | 3d027c0669615acb99a9e1211c337f542ba18c2b (patch) | |
| tree | 794d0472dccd408aa2ce77f78ceca4233c73c25f /dev-java | |
| parent | Fix building with GCC 4.4 wrt #273159. (diff) | |
| download | historical-3d027c0669615acb99a9e1211c337f542ba18c2b.tar.gz historical-3d027c0669615acb99a9e1211c337f542ba18c2b.tar.bz2 historical-3d027c0669615acb99a9e1211c337f542ba18c2b.zip | |
Fix compilation with gcc-4.4; bug #273839
Package-Manager: portage-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/Manifest | 15 | ||||
| -rw-r--r-- | dev-java/jmp/files/jmp-0.51-gcc44.patch | 13 | ||||
| -rw-r--r-- | dev-java/jmp/jmp-0.51.ebuild | 13 |
4 files changed, 42 insertions, 7 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/Manifest b/dev-java/jmp/Manifest index c3ac570e4aba..76e6bb84d37e 100644 --- a/dev-java/jmp/Manifest +++ b/dev-java/jmp/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX jmp-0.51-gcc44.patch 449 RMD160 09ca285d98c1fd53b06ea9f87c77bea192e17e2e SHA1 08b49a1b66ec0a7f265aaeb92acc96634c0dccce SHA256 e8525c258aa624f4a3ef782d66e110cb156d66764c268666462363fff33244b3 DIST jmp-0.51.tar.gz 629336 RMD160 b9ab75267ea88560dafd30fc93eea3b096935ffa SHA1 42ea84fd409b4c8515c4eac848f0ffa9f3325a73 SHA256 6be4c5660e2f74e0c10c3ccd32a709a7eb876faae05b65e89b0fa6f647b65045 -EBUILD jmp-0.51.ebuild 1261 RMD160 bdb77666f6f62756040b0dee9a0a13c73d463874 SHA1 b779eea42d1d3396f015cdbf8a0a71088f4bd080 SHA256 5fe6f016b8c255b980f72df129bc2d3f0aa6bf21261275beedc7a66cb46fa6b4 -MISC ChangeLog 2346 RMD160 6abcd6284fbc0e09f6448ed3f214d9fd394f77de SHA1 21924512e00d88e3bd67f177530607552a18271e SHA256 4b4ca2b29cf102d19b68f21a7ec2db886aab6e1459374ba0669d225329fc027e +EBUILD jmp-0.51.ebuild 1347 RMD160 3efd1867c9dd9e1fc47d1bcb5eb4b057a9ae1b6c SHA1 7fb4f0b43cb42f90567f387e5bdc50182fa41bcc SHA256 119a777bd8e0a065583d2961851edc1b7497ff55e2361e017b5dca3a68f4e597 +MISC ChangeLog 2484 RMD160 80fd6d205622b3cd8e25d93772ebec84a696a950 SHA1 30beeea86dddcb63a2155ea813d216cb685c68f4 SHA256 e90b829c60f840515e5c758e05bf1e9ec42c084843c5be17f9328f026079d87f MISC metadata.xml 406 RMD160 25b6dcdfe3a69a8b95d30065a93af579736c7eef SHA1 b405f462b24c7d53b9252bc039b9dfd8d03da203 SHA256 919c8d9d9940dd2e50b6947fbcc060136afa169da25415e20fcd5c111084b45e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkprbwUACgkQCRZPokWLroRDLACaA8JUOXQNs6hUc3mkOSGlx+ML +9SUAoOBR6zVT5XZhdLTh/pUFW9XuSppD +=pT8D +-----END PGP SIGNATURE----- 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" |