Gentoo Archives: gentoo-commits

From: "Miroslav Sulc (fordfrog)" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/jdbc-mysql/files: 5.1.14-java6.patch
Date: Fri, 28 Jan 2011 14:46:03
Message-Id: 20110128144549.44FCD20057@flycatcher.gentoo.org
1 fordfrog 11/01/28 14:45:49
2
3 Added: 5.1.14-java6.patch
4 Log:
5 dev-java/jdbc-mysql
6
7 (Portage version: 2.1.9.35/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-java/jdbc-mysql/files/5.1.14-java6.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/files/5.1.14-java6.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/files/5.1.14-java6.patch?rev=1.1&content-type=text/plain
14
15 Index: 5.1.14-java6.patch
16 ===================================================================
17 --- build.xml.orig 2010-01-20 19:45:30.000000000 +0100
18 +++ build.xml 2010-02-13 00:34:30.000000000 +0100
19 @@ -131,7 +131,7 @@
20 </if>
21 </target>
22
23 - <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
24 + <target name="init" depends="-init-copy, -init-no-crypto">
25 <!-- We need the following for source distributions as there we
26 can't dynamically alter the classpath, and not having this
27 directory present causes the build to fail -->
28 @@ -746,7 +746,8 @@
29 <javac sourcepath="" srcdir="${buildDir}/${fullProdName}"
30 destdir="${compiler.output}"
31 deprecation="off"
32 - debug="${debug.enable}">
33 + debug="${debug.enable}"
34 + bootclasspath="${gentoo.bootclasspath}">
35 <include name="**/*.java" />
36 <exclude name="testsuite/**" />
37 <exclude name="com/mysql/jdbc/integration/**" />
38 @@ -763,11 +764,7 @@
39 <javac destdir="${compiler.output}"
40 deprecation="off"
41 debug="${debug.enable}"
42 - fork="yes"
43 - executable="${com.mysql.jdbc.java6.javac}"
44 - compiler="modern"
45 - sourcepath="" srcdir="${buildDir}/${fullProdName}"
46 - bootclasspath="${com.mysql.jdbc.java6.rtjar}">
47 + sourcepath="" srcdir="${buildDir}/${fullProdName}">
48 <include name="**/JDBC4*.java" />
49 <include name="com/mysql/jdbc/exceptions/jdbc4/*" />