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 | 92736c69b700c4310ee11bec25a0eedec1b4d383 (patch) | |
| tree | dd3f59067ed9404bd88ffd826dbf97163670e589 /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 | historical-92736c69b700c4310ee11bec25a0eedec1b4d383.tar.gz historical-92736c69b700c4310ee11bec25a0eedec1b4d383.tar.bz2 historical-92736c69b700c4310ee11bec25a0eedec1b4d383.zip | |
Fix compilation with ibm-jdk-bin-1.6, mentioned in bug #284299.
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild | 10 |
3 files changed, 12 insertions, 7 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/Manifest b/dev-java/jdbc-mysql/Manifest index c73151119693..b6ebfe49cadd 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -7,6 +7,6 @@ DIST mysql-connector-java-5.1.10.tar.gz 3666173 RMD160 ef5b6cf4cceaac0c6d3285892 DIST mysql-connector-java-5.1.6.tar.gz 8611213 RMD160 f3b3c48662f6d006a927bf96cb075d1eddc3b382 SHA1 3ebbab405e1578d165fe8910e3c23d808e6fcdd1 SHA256 9dd676f95c38a7adbf25fe0f34ce315e7620260888e15fb6efd26f3f9183f0ec EBUILD jdbc-mysql-5.0.8.ebuild 1877 RMD160 549095e41b5f03cdf0620349136f865fa4c407a8 SHA1 f56dc4dd05b6d9f8817625ad284603ef9afe027c SHA256 3f729bab450b6ad7aa1df43b2270c5fcee18e710ab30cc14bb6ad93ee139f3de EBUILD jdbc-mysql-5.1.10.ebuild 2467 RMD160 37b5b83f640e8dec4a00c97bae127ac53ecde406 SHA1 aad06bfe58a7ed079530aabe1adf937486f72de8 SHA256 10128b3a327e04045c3ae6b66277644e3429c1032c68aeaa61796bd70a3121c8 -EBUILD jdbc-mysql-5.1.6.ebuild 2364 RMD160 9375f264e0fcee989c271867631900ce75adeb7d SHA1 9c57845e862e333c2a1351dbd432b63f0a474de6 SHA256 4e55fcc6892fea93495cb634865d020afe8a4d96439ea527f5c4a28b7e4e9b57 -MISC ChangeLog 12762 RMD160 31deb1a56fa5fde21c37b8cb0e215920e5175d6b SHA1 8843b0969b260029a15b794daa2cc1fc077dcb73 SHA256 c9256b1fc0d0aa932b9fd107f43570353443f116c845736eeb74aa84b0173a5e +EBUILD jdbc-mysql-5.1.6.ebuild 2438 RMD160 f8fc4b3c39142a783653e0110d25a8a0d822010e SHA1 7c01fbce3063abcf72881badb4bbfe60de9028bc SHA256 1d3c31647fdb2226c1c994bab31f4a68309d71dfb7500e1d037f8603989ce6ea +MISC ChangeLog 12905 RMD160 253de6fe9c294d8ba8bc3303c034e2e4e8513b1c SHA1 fdaf2295a5fa465ca8e93055ed1201eb103803ec SHA256 ea20ba4870a4095ef01dca4bd5d706bc19372ccc83107d20c1dda8630b878baa MISC metadata.xml 275 RMD160 5f7d304e228469061c6cf78501f5dc993a3f8a06 SHA1 9ac7f996334ebfc5a6c4acfbaae8b3b28e69618e SHA256 66f7ef9181218b25bd6152f27a5e0e6699cfad8967bbf535da17c0caff9591d4 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}" |