Fridrich Strba
f50a5911ce
Allow building with java > 1.8 OBS-URL: https://build.opensuse.org/request/show/1265235 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jblas?expand=0&rev=2
43 lines
2.3 KiB
Diff
43 lines
2.3 KiB
Diff
--- jblas-jblas-1.2.5/build.xml 2025-03-28 16:16:41.840757118 +0100
|
|
+++ jblas-jblas-1.2.5/build.xml 2025-03-28 16:25:41.391963639 +0100
|
|
@@ -126,12 +126,12 @@
|
|
<mkdir dir="${bin}" />
|
|
</target>
|
|
<target name="compile" depends="prepare,generate-float" description="compile java code">
|
|
- <javac destdir="${bin}" encoding="utf-8" source="1.7" debug="on" compiler="javac1.7" target="1.7" fork="yes" nowarn="yes">
|
|
+ <javac destdir="${bin}" encoding="utf-8" source="1.8" debug="on" compiler="javac1.8" target="1.8" fork="yes" nowarn="yes">
|
|
<src path="${src}" />
|
|
</javac>
|
|
</target>
|
|
<target name="compile-test" depends="compile" description="compile java test code">
|
|
- <javac destdir="${bin}" encoding="utf-8" source="1.7" debug="on" compiler="javac1.7" target="1.7" fork="yes" nowarn="yes">
|
|
+ <javac destdir="${bin}" encoding="utf-8" source="1.8" debug="on" compiler="javac1.8" target="1.8" fork="yes" nowarn="yes">
|
|
<src path="${test}" />
|
|
<classpath>
|
|
<pathelement location="${external}/junit-4.8.2.jar" />
|
|
@@ -139,23 +139,11 @@
|
|
</javac>
|
|
</target>
|
|
<target name="javah" depends="prepare" description="run javah">
|
|
- <javac destdir="${bin}" encoding="utf-8" source="1.7" debug="on" compiler="javac1.7" target="1.7" fork="yes" nowarn="yes">
|
|
+ <javac destdir="${bin}" nativeheaderdir="${include}" encoding="utf-8" source="1.8" debug="on" compiler="javac1.8" target="1.8" fork="yes" nowarn="yes">
|
|
<src path="${src}" />
|
|
<include name="**/NativeBlas.java" />
|
|
<include name="**/ArchFlavor.java" />
|
|
</javac>
|
|
- <javah destdir="${include}" force="yes">
|
|
- <class name="${pkgbase}.NativeBlas" />
|
|
- <classpath>
|
|
- <pathelement path="${bin}" />
|
|
- </classpath>
|
|
- </javah>
|
|
- <javah destdir="${include}" force="yes">
|
|
- <class name="org.jblas.util.ArchFlavor" />
|
|
- <classpath>
|
|
- <pathelement path="${bin}" />
|
|
- </classpath>
|
|
- </javah>
|
|
</target>
|
|
<target name="generate-float" depends="preprocess" description="generate float versions of classes">
|
|
<class-to-float class="${pkgbase}.DoubleMatrix"/>
|