diff options
author | Vlastimil Babka <caster@gentoo.org> | 2007-01-12 13:40:19 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2007-01-12 13:40:19 +0000 |
commit | 0ec0978a2ab15f880a295b1f99d7d50b76a10dc4 (patch) | |
tree | 970f52548ecdbc6104ce235b2820bc838484c0db /dev-java/sun-jdk | |
parent | bump to rsbac 1.3.1 and kernel 2.6.19 (diff) | |
download | gentoo-2-0ec0978a2ab15f880a295b1f99d7d50b76a10dc4.tar.gz gentoo-2-0ec0978a2ab15f880a295b1f99d7d50b76a10dc4.tar.bz2 gentoo-2-0ec0978a2ab15f880a295b1f99d7d50b76a10dc4.zip |
Make libstdc++ dependency x86-only - amd64 doesn't contain libdeploy.so, the only file linking to it. Bug #161536.
(Portage version: 2.1.2_rc4-r8)
Diffstat (limited to 'dev-java/sun-jdk')
-rw-r--r-- | dev-java/sun-jdk/ChangeLog | 6 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 51322c7e57ac..4067fcd371e2 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.180 2007/01/11 23:36:19 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.181 2007/01/12 13:40:19 caster Exp $ + + 12 Jan 2007; Vlastimil Babka <caster@gentoo.org> sun-jdk-1.6.0-r1.ebuild: + Make libstdc++ dependency x86-only - amd64 version doesn't contain + libdeploy.so, the only file linking to it. Bug #161536. 11 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> -sun-jdk-1.5.0.09-r1.ebuild, -sun-jdk-1.6.0.ebuild: diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild index fc71397d7872..9dbd735f0701 100644 --- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.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/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.4 2007/01/11 14:41:49 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.5 2007/01/12 13:40:19 caster Exp $ inherit java-vm-2 eutils pax-utils @@ -36,7 +36,7 @@ DEPEND=" RDEPEND=" ${DEPEND} - =virtual/libstdc++-3.3 + x86? ( =virtual/libstdc++-3.3 ) sys-libs/glibc alsa? ( media-libs/alsa-lib ) X? ( || ( ( x11-libs/libX11 |