Accepting request 569351 from home:fstrba:branches:science

Fix build with jdk10

OBS-URL: https://build.opensuse.org/request/show/569351
OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=113

vtk.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 24 11:28:47 UTC 2018 - fstrba@suse.com
+
+- Fix build with jdk10
+  * give a bogus javah path "%{_bindir}/true", since the cmake
+    checks the javah binary although the build does not use it.
+
 -------------------------------------------------------------------
 Fri Jan 12 13:43:49 UTC 2018 - badshah400@gmail.com
 

vtk.spec

@@ -54,7 +54,7 @@ BuildRequires:  gl2ps-devel
 BuildRequires:  gnuplot
 BuildRequires:  graphviz
 BuildRequires:  hdf5-devel
-BuildRequires:  java-devel <= 9
+BuildRequires:  java-devel
 BuildRequires:  libX11-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libexpat-devel
@@ -263,7 +263,13 @@ fi
 
 mkdir build
 pushd build
-cmake .. \
+# FindJava.cmake looks for javah executable. However,
+# the build never invokes the tool. Define a bogus
+# Java_JAVAH_EXECUTABLE in order to be able to build
+# with JDK10 that does not have this tool, deprecated
+# since JDK8.
+cmake ..  \
+    -DJava_JAVAH_EXECUTABLE:PATH=%{_bindir}/true\
     -DCMAKE_CXX_COMPILER:STRING='mpicxx' \
     -DCMAKE_C_COMPILER:STRING='mpicc' \
     -DBUILD_DOCUMENTATION:BOOL=ON \