This commit is contained in:
parent
d9dbedeab2
commit
dbf8f531de
@ -1,55 +0,0 @@
|
||||
--- mysql-connector-j-8.1.0/build.xml 2023-09-18 09:29:29.026966561 +0200
|
||||
+++ mysql-connector-j-8.1.0/build.xml 2023-09-18 09:59:22.378978201 +0200
|
||||
@@ -1129,12 +1129,13 @@
|
||||
<target name="-compile-driver" depends="-init, -clean-classes">
|
||||
<echo>Compiling MySQL Connector/J with '${com.mysql.cj.build.jdk}' to '${com.mysql.cj.build.compiler.output}'</echo>
|
||||
|
||||
+ <sequential>
|
||||
<javac sourcepath=""
|
||||
srcdir="${com.mysql.cj.build.dir.driver}"
|
||||
destdir="${com.mysql.cj.build.compiler.output}"
|
||||
deprecation="off"
|
||||
debug="${com.mysql.cj.build.addDebugInfo}"
|
||||
- fork="yes"
|
||||
+ fork="no"
|
||||
executable="${com.mysql.cj.build.jdk.javac}"
|
||||
compiler="modern"
|
||||
includeantruntime="false"
|
||||
@@ -1145,30 +1146,34 @@
|
||||
<classpath refid="com.mysql.cj.build.classpath" />
|
||||
<compilerarg line="${javac.compilerarg}" />
|
||||
</javac>
|
||||
+ <sleep seconds="1"/>
|
||||
<java jvm="${com.mysql.cj.build.jdk.java}"
|
||||
classname="instrumentation.CommonChecks"
|
||||
classpathref="com.mysql.cj.build.instrumentation.classpath"
|
||||
- fork="yes"
|
||||
+ fork="no"
|
||||
failonerror="true">
|
||||
<arg value="${com.mysql.cj.build.compiler.output}" />
|
||||
<arg value="${com.mysql.cj.build.verbose}" />
|
||||
</java>
|
||||
+ <sleep seconds="1"/>
|
||||
<java jvm="${com.mysql.cj.build.jdk.java}"
|
||||
classname="instrumentation.TranslateExceptions"
|
||||
classpathref="com.mysql.cj.build.instrumentation.classpath"
|
||||
- fork="yes"
|
||||
+ fork="no"
|
||||
failonerror="true">
|
||||
<arg value="${com.mysql.cj.build.compiler.output}" />
|
||||
<arg value="${com.mysql.cj.build.verbose}" />
|
||||
</java>
|
||||
+ <sleep seconds="1"/>
|
||||
<java jvm="${com.mysql.cj.build.jdk.java}"
|
||||
classname="instrumentation.AddMethods"
|
||||
classpathref="com.mysql.cj.build.instrumentation.classpath"
|
||||
- fork="yes"
|
||||
+ fork="no"
|
||||
failonerror="true">
|
||||
<arg value="${com.mysql.cj.build.compiler.output}" />
|
||||
<arg value="${com.mysql.cj.build.verbose}" />
|
||||
</java>
|
||||
+ </sequential>
|
||||
</target>
|
||||
|
||||
|
@ -37,7 +37,6 @@ Patch0: javac-check.patch
|
||||
# The patch doesn't remove the file AuthenticationOciClient.java
|
||||
# therefore it's removed during prep phase
|
||||
Patch1: %{name}-remove-oci-support.patch
|
||||
Patch2: %{name}-sequential.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-contrib
|
||||
BuildRequires: apache-commons-logging
|
||||
@ -81,7 +80,6 @@ set that supports the capabilities of MySQL.
|
||||
%setup -q -n mysql-connector-j-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150200
|
||||
# ship protobuf generated files compatible with protobuf 3.9.2
|
||||
|
Loading…
Reference in New Issue
Block a user