summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2010-02-13 00:02:58 +0000
committerVlastimil Babka <caster@gentoo.org>2010-02-13 00:02:58 +0000
commit2adac5155416091dd3389b8f3da63ba8ba9e5a5e (patch)
treed15c5b45355fdd267beeaed569d64260330c788c /dev-java/jdbc-mysql/files
parentmcelog bump (diff)
downloadhistorical-2adac5155416091dd3389b8f3da63ba8ba9e5a5e.tar.gz
historical-2adac5155416091dd3389b8f3da63ba8ba9e5a5e.tar.bz2
historical-2adac5155416091dd3389b8f3da63ba8ba9e5a5e.zip
Version bump. Remove dependency on 1.5 JDK using bootclasspath magic, fixes bug #283848.
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'dev-java/jdbc-mysql/files')
-rw-r--r--dev-java/jdbc-mysql/files/5.1.11-java6.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/dev-java/jdbc-mysql/files/5.1.11-java6.patch b/dev-java/jdbc-mysql/files/5.1.11-java6.patch
new file mode 100644
index 000000000000..1e3c21d16612
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.1.11-java6.patch
@@ -0,0 +1,34 @@
+--- build.xml.orig 2010-01-20 19:45:30.000000000 +0100
++++ build.xml 2010-02-13 00:34:30.000000000 +0100
+@@ -124,7 +124,7 @@
+ </if>
+ </target>
+
+- <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
++ <target name="init" depends="-init-copy, -init-no-crypto">
+ <!-- If we're building under cruise control, update ourself -->
+
+ <if>
+@@ -746,7 +746,8 @@
+ <javac sourcepath="" srcdir="${buildDir}/${fullProdName}"
+ destdir="${compiler.output}"
+ deprecation="off"
+- debug="${debug.enable}">
++ debug="${debug.enable}"
++ bootclasspath="${gentoo.bootclasspath}">
+ <include name="**/*.java" />
+ <exclude name="testsuite/**" />
+ <exclude name="com/mysql/jdbc/integration/**" />
+@@ -763,11 +764,7 @@
+ <javac destdir="${compiler.output}"
+ deprecation="off"
+ debug="${debug.enable}"
+- fork="yes"
+- executable="${com.mysql.jdbc.java6.javac}"
+- compiler="modern"
+- sourcepath="" srcdir="${buildDir}/${fullProdName}"
+- bootclasspath="${com.mysql.jdbc.java6.rtjar}">
++ sourcepath="" srcdir="${buildDir}/${fullProdName}">
+ <include name="**/JDBC4*.java" />
+ <include name="com/mysql/jdbc/exceptions/jdbc4/*" />
+