diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-02-12 22:55:28 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-02-12 22:55:28 +0000 |
| commit | 9b7fdf21635da3ecc4217570a24a93d0313166fd (patch) | |
| tree | d70dd2612d0a8b8f3a368b9f982a8df91167f0fa /dev-java/jdbc-mysql | |
| parent | Fix depend to <kde-base/kwin-4.4.0 because it's been included in KDE 4.4.0. T... (diff) | |
| download | gentoo-2-9b7fdf21635da3ecc4217570a24a93d0313166fd.tar.gz gentoo-2-9b7fdf21635da3ecc4217570a24a93d0313166fd.tar.bz2 gentoo-2-9b7fdf21635da3ecc4217570a24a93d0313166fd.zip | |
Fix compilation with ibm-jdk-bin-1.6, mentioned in bug #284299.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jdbc-mysql')
| -rw-r--r-- | dev-java/jdbc-mysql/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog index 7060196aad77..700879610bfb 100644 --- a/dev-java/jdbc-mysql/ChangeLog +++ b/dev-java/jdbc-mysql/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jdbc-mysql # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.66 2010/01/07 21:23:48 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.67 2010/02/12 22:55:28 caster Exp $ + + 12 Feb 2010; Vlastimil Babka <caster@gentoo.org> jdbc-mysql-5.1.6.ebuild: + Fix compilation with ibm-jdk-bin-1.6, mentioned in bug #284299. 07 Jan 2010; Brent Baude <ranger@gentoo.org> jdbc-mysql-5.1.6.ebuild: stable ppc, bug 284299 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild index 52dd0d43f6a3..2998f8ce8787 100644 --- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild +++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild,v 1.3 2010/01/07 21:23:48 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild,v 1.4 2010/02/12 22:55:28 caster Exp $ JAVA_PKG_IUSE="source" WANT_ANT_TASKS="ant-contrib" @@ -40,7 +40,9 @@ src_unpack() { epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch" # http://bugs.mysql.com/bug.php?id=28286 epatch "${FILESDIR}/5.0.5-dist-target-depends.patch" - epatch "${FILESDIR}/5.1.6-java6-detection.patch" + + # checks fail if java6 bootclasspath is not a single jar + sed -i 's/depends="-compiler-check, /depends="/' build.xml || die rm -v *.jar || die @@ -61,10 +63,10 @@ EANT_BUILD_TARGET="dist" src_compile() { local vm=$(depend-java-query -v ">=virtual/jdk-1.6") local javac=$(GENTOO_VM="${vm}" java-config --javac) - local rt=$(GENTOO_VM="${vm}" java-config --jdk-home)/jre/lib/rt.jar + local rt=$(GENTOO_VM="${vm}" java-config -g BOOTCLASSPATH) einfo "Using ${vm} to compile the JDBC4 driver" einfo "javac: ${javac}" - einfo "rt.jar: ${rt}" + einfo "bootclasspath: ${rt}" java-pkg-2_src_compile \ -Dcom.mysql.jdbc.java6.javac="${javac}" \ -Dcom.mysql.jdbc.java6.rtjar="${rt}" |