File scilab-openjdk9-no-javah.patch of Package scilab

Overview Repositories Revisions Requests Users Attributes Meta

File scilab-openjdk9-no-javah.patch of Package scilab (Revision 1232b7e59690334b76931a8dc8440d9f)

Currently displaying revision 1232b7e59690334b76931a8dc8440d9f , Show latest

From: Clément DAVID <clement.david@esi-group.com>
Date: Fri, 8 Dec 2017 12:56:53 +0000 (+0100)
Subject: configure: detect Java 9 correctly
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=34213c9e5ca5dbb2f421eeb173a67da236b9327f;hp=5cf6aebe58a73d759b4e53978fdd60bd8b0e0191

configure: detect Java 9 correctly

Change-Id: I9b77db62a6fea7ceb1176df1bbf513268dca7e37
---

Index: scilab-6.0.1/configure
===================================================================
--- scilab-6.0.1.orig/configure
+++ scilab-6.0.1/configure
@@ -12987,100 +12987,7 @@ fi
         JAVA_G=$JAVA
     fi
 
-    TOOL=javah
-
-    if test "$cross_compiling" = "yes" ; then
-        # Extract the first word of "$TOOL", so it can be a program name with args.
-set dummy $TOOL; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVAH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVAH=$ac_cv_path_JAVAH
-if test -n "$JAVAH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
-$as_echo "$JAVAH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    else
-        # Extract the first word of "$TOOL", so it can be a program name with args.
-set dummy $TOOL; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVAH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $ac_java_jvm_bin_dir
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVAH=$ac_cv_path_JAVAH
-if test -n "$JAVAH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
-$as_echo "$JAVAH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    fi
-
-    # Check to see if JAVAH could not be found
-
-
-    if test "x$JAVAH" = "x" ; then
-        as_fn_error $? "Cannot find $TOOL" "$LINENO" 5
-    fi
-
-
+    JAVAH="$JAVAC -h"
 
 
     if test "$cross_compiling" = "yes" ; then
Index: scilab-6.0.1/m4/java.m4
===================================================================
--- scilab-6.0.1.orig/m4/java.m4
+++ scilab-6.0.1/m4/java.m4
@@ -796,9 +796,6 @@ AC_DEFUN([AC_JAVA_TOOLS], [
         JAVA_G=$JAVA
     fi
 
-    TOOL=javah
-    AC_JAVA_TOOLS_CHECK(JAVAH, $TOOL, $ac_java_jvm_bin_dir)
-
     AC_JAVA_TOOLS_CHECK(JAR, jar, $ac_java_jvm_bin_dir)
 
     AC_JAVA_TOOLS_CHECK(JAVADOC, javadoc, $ac_java_jvm_bin_dir)

Places

File scilab-openjdk9-no-javah.patch of Package scilab (Revision 1232b7e59690334b76931a8dc8440d9f)

Places