diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2007-05-09 09:56:23 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2007-05-09 09:56:23 +0000 |
| commit | 3115b9b1932a89ce17745e4eb122bd729158a39a (patch) | |
| tree | ca1fd4e7ee7d9acdfb366f0b60e6a7ca9bf6390e | |
| parent | Stable on alpha wrt security bug #169372 (diff) | |
| download | historical-3115b9b1932a89ce17745e4eb122bd729158a39a.tar.gz historical-3115b9b1932a89ce17745e4eb122bd729158a39a.tar.bz2 historical-3115b9b1932a89ce17745e4eb122bd729158a39a.zip | |
Re-added compile flag for javac needed on amd64 (see bug #177506).
Package-Manager: portage-2.1.2.5
| -rw-r--r-- | sci-libs/vtk/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/vtk/Manifest | 16 | ||||
| -rw-r--r-- | sci-libs/vtk/vtk-5.0.3.ebuild | 13 |
3 files changed, 22 insertions, 12 deletions
diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog index 7e0df7fbacb8..271aa2deece2 100644 --- a/sci-libs/vtk/ChangeLog +++ b/sci-libs/vtk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/vtk # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.32 2007/05/07 12:38:32 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.33 2007/05/09 09:56:23 markusle Exp $ + + 08 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild: + Re-added compile flag for javac needed on amd64 (see bug #177506). 06 May 2007; Markus Dittrich <markusle@gentoo.org> +files/vtk-5.0.3-lammpi.patch, vtk-5.0.3.ebuild: diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index 141bbd203877..3453e137e0dc 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -14,14 +14,14 @@ EBUILD vtk-5.0.2.ebuild 8371 RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 SHA MD5 3ab1a3c117bfaf08a05d31daed7b4518 vtk-5.0.2.ebuild 8371 RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 vtk-5.0.2.ebuild 8371 SHA256 4001ba54ffe6c8fc2291d527b8f6d5f68a01d4cbd1e7767085efd98b00374c44 vtk-5.0.2.ebuild 8371 -EBUILD vtk-5.0.3.ebuild 8381 RMD160 f94e8217d17317452f5145c632afb275a53658b7 SHA1 6a753de7f32df3cd66c25114113a9096ac898a33 SHA256 ee94fa0f33a683b32324012bf214e1101a2831c208efce2827854c5d6a5f7b75 -MD5 947e8adc032d41489a7ee58837b6a814 vtk-5.0.3.ebuild 8381 -RMD160 f94e8217d17317452f5145c632afb275a53658b7 vtk-5.0.3.ebuild 8381 -SHA256 ee94fa0f33a683b32324012bf214e1101a2831c208efce2827854c5d6a5f7b75 vtk-5.0.3.ebuild 8381 -MISC ChangeLog 5910 RMD160 27ff79a3f37638f5337a189657a99d4e2a288960 SHA1 10f52fb429f703ed03946d53d00a1c59086fd3ff SHA256 a08248ee94f47f1e35f7ed95875275ceaa56cd6fb5bd3837117f3f666d3b9b03 -MD5 13e7d61a0a4cd9764820558797edcc22 ChangeLog 5910 -RMD160 27ff79a3f37638f5337a189657a99d4e2a288960 ChangeLog 5910 -SHA256 a08248ee94f47f1e35f7ed95875275ceaa56cd6fb5bd3837117f3f666d3b9b03 ChangeLog 5910 +EBUILD vtk-5.0.3.ebuild 8633 RMD160 9fddb7c0e1840a5a916b7e090b8c2b1b172bed5a SHA1 da6e3a613f68fd816be1226469a176de719155e1 SHA256 3019ba8a06e2f741d8f496c62adda3a492c9ceb5536ec9443cef6ca26852306e +MD5 9f17696bedaa58f38679f678ef0da669 vtk-5.0.3.ebuild 8633 +RMD160 9fddb7c0e1840a5a916b7e090b8c2b1b172bed5a vtk-5.0.3.ebuild 8633 +SHA256 3019ba8a06e2f741d8f496c62adda3a492c9ceb5536ec9443cef6ca26852306e vtk-5.0.3.ebuild 8633 +MISC ChangeLog 6051 RMD160 1a5de0aba1a78418cb54a95cae160fecd17262ae SHA1 3e37109a5d3ea24436fb79107d1c66a2797ffba8 SHA256 b14d35cc08867658465da519c2440dd1b58a8a395a2116eb6e8949d13de6db61 +MD5 d6e5690a5dc62b5664ca3fe63e823b8a ChangeLog 6051 +RMD160 1a5de0aba1a78418cb54a95cae160fecd17262ae ChangeLog 6051 +SHA256 b14d35cc08867658465da519c2440dd1b58a8a395a2116eb6e8949d13de6db61 ChangeLog 6051 MISC metadata.xml 273 RMD160 813d00f411ea6b62bca9352968caa1c05daaaeec SHA1 852b5371f1bb0b4d5c4934f75b434e8f252533b7 SHA256 b930aead56cb1a6abb648c097836b6e8bf08c1ffa2038ad071aa1c98d1602e56 MD5 d7a28dcb154993208468f0227e99c94b metadata.xml 273 RMD160 813d00f411ea6b62bca9352968caa1c05daaaeec metadata.xml 273 diff --git a/sci-libs/vtk/vtk-5.0.3.ebuild b/sci-libs/vtk/vtk-5.0.3.ebuild index 3c9eb8a3526b..0d5ef665734d 100644 --- a/sci-libs/vtk/vtk-5.0.3.ebuild +++ b/sci-libs/vtk/vtk-5.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.3.ebuild,v 1.4 2007/05/07 12:38:32 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.3.ebuild,v 1.5 2007/05/09 09:56:23 markusle Exp $ inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3 @@ -16,8 +16,7 @@ LICENSE="BSD" KEYWORDS="~amd64 ~x86" SLOT="0" IUSE="doc examples mpi patented python tcl tk threads qt3 qt4" -RDEPEND="java? ( =virtual/jdk-1.5* ) - mpi? ( virtual/mpi ) +RDEPEND="mpi? ( virtual/mpi ) python? ( >=dev-lang/python-2.0 ) tcl? ( >=dev-lang/tcl-8.2.3 ) tk? ( >=dev-lang/tk-8.2.3 ) @@ -30,6 +29,7 @@ RDEPEND="java? ( =virtual/jdk-1.5* ) || ( x11-libs/libXmu virtual/x11 )" DEPEND="${RDEPEND} + java? ( >=virtual/jdk-1.5 ) >=dev-util/cmake-2.2.3 qt3? ( $(qt_min_version 3.3.4) ) qt4? ( >=x11-libs/qt-4.1.0 )" @@ -165,6 +165,13 @@ src_compile() { cmake ${CMAKE_VARIABLES} . && cmake ${CMAKE_VARIABLES} . \ || die "cmake configuration failed" + # fix java.lang.OutOfMemoryError on amd64 (see bug #123178) + if use java && [ "${ARCH}" == "amd64" ]; then + sed -e "s/javac/javac -J-Xmx256m/" \ + -i "${S}"/Wrapping/Java/CMakeFiles/VTKBuildAll.dir/build.make \ + || die "Failed to patch javac" + fi + emake -j1 || die "emake failed" } |