[jblas] 29/30: Apply patches from Christ West and fix FTBFS with Java 9.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jblas.

commit fe10f4ef2c25e94f238e506d5ca5bc7e8176a96e
Author: Markus Koschany <apo at debian.org>
Date:   Tue Oct 24 15:36:28 2017 +0200

    Apply patches from Christ West and fix FTBFS with Java 9.
---
 debian/patches/java9-part2.patch | 22 +++++++++++++++++
 debian/patches/java9.patch       | 53 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  2 ++
 3 files changed, 77 insertions(+)

diff --git a/debian/patches/java9-part2.patch b/debian/patches/java9-part2.patch
new file mode 100644
index 0000000..582b855
--- /dev/null
+++ b/debian/patches/java9-part2.patch
@@ -0,0 +1,22 @@
+From 49d1f77e1da8d2fdba54ff2b8d35a36d7403724d Mon Sep 17 00:00:00 2001
+From: "Chris West (Faux)" <git at goeswhere.com>
+Date: Wed, 23 Aug 2017 20:41:39 +0100
+Subject: [PATCH] java9: remove /jre suffix iff it's present
+
+---
+ config/config_java.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/config_java.rb b/config/config_java.rb
+index 4e309ec..f9c0f90 100644
+--- a/config/config_java.rb
++++ b/config/config_java.rb
+@@ -55,7 +55,7 @@
+   if ENV.include? 'JAVA_HOME'
+     java_home = ENV['JAVA_HOME']
+   else
+-    java_home = dir(File.dirname(%x(java -cp config PrintProperty java.home)))
++    java_home = dir(%x(java -cp config PrintProperty java.home).chomp.gsub(/\/jre$/, ''))
+   end
+   #if CONFIG['OS_NAME'] == 'Mac\ OS\ X'
+   #  java_home = File.join(java_home, 'Home')
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..c762409
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,53 @@
+From 999ff7186a756751ea03ca2b53e2af783135900e Mon Sep 17 00:00:00 2001
+From: "Chris West (Faux)" <git at goeswhere.com>
+Date: Wed, 23 Aug 2017 20:32:09 +0100
+Subject: [PATCH] java9: use -source/-target 1.6 as 1.5 is unsupported
+
+---
+ build.xml | 6 +++---
+ pom.xml   | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 3092333..87a6117 100644
+--- a/build.xml
++++ b/build.xml
+@@ -126,12 +126,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+         <mkdir dir="${bin}" />
+     </target>
+     <target name="compile" depends="prepare,generate-float" description="compile java code">
+-        <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
++        <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" 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.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
++        <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" fork="yes" nowarn="yes">
+             <src path="${test}" />
+             <classpath>
+                 <pathelement location="${external}/junit-4.8.2.jar" />
+@@ -139,7 +139,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+         </javac>
+     </target>
+     <target name="javah" depends="prepare" description="run javah">
+-        <javac destdir="${bin}" encoding="utf-8" source="1.5" debug="on" compiler="javac1.5" target="1.5" fork="yes" nowarn="yes">
++        <javac destdir="${bin}" encoding="utf-8" source="1.6" debug="on" compiler="javac1.5" target="1.6" fork="yes" nowarn="yes">
+             <src path="${src}" />
+             <include name="**/NativeBlas.java" />
+             <include name="**/ArchFlavor.java" />
+diff --git a/pom.xml b/pom.xml
+index e67ff5e..e6dccf0 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -58,8 +58,8 @@
+         <artifactId>maven-compiler-plugin</artifactId>
+         <version>2.3.2</version>
+         <configuration>
+-          <source>1.5</source>
+-          <target>1.5</target>
++          <source>1.6</source>
++          <target>1.6</target>
+         </configuration>
+       </plugin>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a90d114..70ecc01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 version-property.patch
 debug-symbols.patch
 javadoc.patch
+java9.patch
+java9-part2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jblas.git