pool/mysql-connector-java
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=95

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-26 02:14:11 +00:00 committed by Git OBS Bridge
parent 507316d0fd
commit 587597f113
2 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-connector-java.spec
View File

@ -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: reproducible-builds.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

53
reproducible-builds.patch
View File

@ -1,53 +0,0 @@
diff -urEbwB mysql-connector-j-8.1.0.orig/build.xml mysql-connector-j-8.1.0/build.xml
--- mysql-connector-j-8.1.0.orig/build.xml 2023-09-18 09:29:29.026966561 +0200
+++ mysql-connector-j-8.1.0/build.xml 2023-09-25 19:35:06.221166735 +0200
@@ -1124,9 +1124,7 @@
description="Compiles driver, JUnit test suite and integration 'helpers' for third-party software."
depends="-init, -compile-driver, -compile-integration" />
-
- <!-- Compile the driver code. -->
- <target name="-compile-driver" depends="-init, -clean-classes">
+ <target name="-compile-driver-compile" depends="-init, -clean-classes">
<echo>Compiling MySQL Connector/J with '${com.mysql.cj.build.jdk}' to '${com.mysql.cj.build.compiler.output}'</echo>
<javac sourcepath=""
@@ -1145,6 +1143,11 @@
<classpath refid="com.mysql.cj.build.classpath" />
<compilerarg line="${javac.compilerarg}" />
</javac>
+ </target>
+
+ <target name="-compile-driver-commonschecks" depends="-compile-driver-compile" >
+ <echo>Compiling MySQL Connector/J: instrumentation.CommonsChecks</echo>
+
<java jvm="${com.mysql.cj.build.jdk.java}"
classname="instrumentation.CommonChecks"
classpathref="com.mysql.cj.build.instrumentation.classpath"
@@ -1153,6 +1156,11 @@
<arg value="${com.mysql.cj.build.compiler.output}" />
<arg value="${com.mysql.cj.build.verbose}" />
</java>
+ </target>
+
+ <target name="-compile-driver-translateexceptions" depends="-compile-driver-commonschecks" >
+ <echo>Compiling MySQL Connector/J: instrumentation.TranslateExceptions</echo>
+
<java jvm="${com.mysql.cj.build.jdk.java}"
classname="instrumentation.TranslateExceptions"
classpathref="com.mysql.cj.build.instrumentation.classpath"
@@ -1161,6 +1169,14 @@
<arg value="${com.mysql.cj.build.compiler.output}" />
<arg value="${com.mysql.cj.build.verbose}" />
</java>
+ </target>
+
+ <!-- Compile the driver code. -->
+ <target name="-compile-driver" depends="-compile-driver-addmethods" />
+
+ <target name="-compile-driver-addmethods" depends="-compile-driver-translateexceptions" >
+ <echo>Compiling MySQL Connector/J: instrumentation.AddMethods</echo>
+
<java jvm="${com.mysql.cj.build.jdk.java}"
classname="instrumentation.AddMethods"
classpathref="com.mysql.cj.build.instrumentation.classpath"