diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-09-09 09:24:34 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-09-09 09:24:34 +0000 |
| commit | ba8c1071d347a7a3ed0c005517a72a7835bee23d (patch) | |
| tree | 268aed3746f884dbf72de6fda6a66c4bc139b5a0 | |
| parent | Use java-pkg-simple eclass to build just the netx.jar we need and nothing els... (diff) | |
| download | gentoo-2-ba8c1071d347a7a3ed0c005517a72a7835bee23d.tar.gz gentoo-2-ba8c1071d347a7a3ed0c005517a72a7835bee23d.tar.bz2 gentoo-2-ba8c1071d347a7a3ed0c005517a72a7835bee23d.zip | |
Use /usr/lib instead of get_libdir for the vmhome path, bug #380853.
(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-6.1.10.2.ebuild | 5 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-6.1.10.3.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index b0b5bbccd415..d3f460ac55f6 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.31 2011/07/22 09:02:15 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.32 2011/09/09 09:24:34 caster Exp $ + + 09 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.2.ebuild, + icedtea-6.1.10.3.ebuild: + Use /usr/lib instead of get_libdir for the vmhome path, bug #380853. *icedtea-6.1.10.3 (22 Jul 2011) diff --git a/dev-java/icedtea/icedtea-6.1.10.2.ebuild b/dev-java/icedtea/icedtea-6.1.10.2.ebuild index ff674c79bbed..6b6eacc4e052 100644 --- a/dev-java/icedtea/icedtea-6.1.10.2.ebuild +++ b/dev-java/icedtea/icedtea-6.1.10.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.2.ebuild,v 1.2 2011/07/17 19:18:52 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.2.ebuild,v 1.3 2011/09/09 09:24:34 caster Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -180,7 +180,8 @@ src_prepare() { src_configure() { local config procs rhino_jar local vm=$(java-pkg_get-current-vm) - local vmhome="/usr/$(get_libdir)/jvm/${vm}" + # the VM symlinks are installed specifically to /usr/lib (not get_libdir), bug 380853 + local vmhome="/usr/lib/jvm/${vm}" # IcedTea6 can't be built using IcedTea7; its class files are too new if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then diff --git a/dev-java/icedtea/icedtea-6.1.10.3.ebuild b/dev-java/icedtea/icedtea-6.1.10.3.ebuild index 1142c8f45b56..fc77d938ca0f 100644 --- a/dev-java/icedtea/icedtea-6.1.10.3.ebuild +++ b/dev-java/icedtea/icedtea-6.1.10.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.3.ebuild,v 1.1 2011/07/22 09:02:15 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.3.ebuild,v 1.2 2011/09/09 09:24:34 caster Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -175,7 +175,8 @@ unset_vars() { src_configure() { local config procs rhino_jar local vm=$(java-pkg_get-current-vm) - local vmhome="/usr/$(get_libdir)/jvm/${vm}" + # the VM symlinks are installed specifically to /usr/lib (not get_libdir), bug 380853 + local vmhome="/usr/lib/jvm/${vm}" # IcedTea6 can't be built using IcedTea7; its class files are too new if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then |