Attachment 73676 Details for Bug 157655

For your information: diff of the changea in the "java" wrapper script.

java.in.diff (text/plain), 2.02 KB, created by Johannes Meixner on 2006-03-17 11:23:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Meixner

Created: 2006-03-17 11:23:42 UTC

Size: 2.02 KB

patch

obsolete

>--- java.in.orig	2005-01-24 21:41:32.000000000 +0100
>+++ java.in	2006-03-17 11:54:35.000000000 +0100
>@@ -1,6 +1,18 @@
> #!/bin/sh
>-# Emulate the jdk java command using gcj
>+# Emulate the jdk java command using gij
> # (c) 2002-2003 Bernhard Rosenkraenzer <bero@arklinux.org>
>+# SUSE change:
>+# Call gij instead of gcj.
>+# Reason: See Suse/Novell Bugzilla bug #155729 and bug #157655:
>+# "gcj" is only available when gcc-java is installed,
>+# which cannot be installed by default (see bug #151732).
>+# Calling gij is the more correct executable because
>+# "java" is the runtime interpreter corresponding to gij
>+# while gcj is the compiler corresponding to javac.
>+# When calling gij there is an output 'java version ...'
>+# so that the echo commands for gcj have been deactivated.
>+# Additionally empty lines in the gij output are suppressed
>+# to have it as much as possible the same as the gcj output.
> 
> libgcjjar="@GCJ_JAR_DIR@/libgcj-`@GCJ_BIN_DIR@/gij@gcc_suffix@ --version | \
>     head -n 1 | sed 's:^gij .* version $[^[:space:]]*$ .*$:\1:'`.jar"
>@@ -13,8 +25,8 @@
> unset HAVE_APPNAME || :
> while [ "$#" != 0 ]; do
>         if [ -z "$HAVE_APPNAME" -a "$1" = "-version" ]; then
>-                echo 'java version "@JAVA_VERSION@"' 1>&2
>-                gcj@gcc_suffix@ --version 1>&2
>+                # echo 'java version "@JAVA_VERSION@"' 1>&2
>+                gij --version | tr -s '\n' 1>&2
>                 exit 0
>         elif [ -z "$HAVE_APPNAME" -a "$1" = "-jar" ]; then
> 		shift
>@@ -27,8 +39,8 @@
>                 echo 'java full version "gcj-@JAVA_VERSION@"' 1>&2
>                 exit 0
>         elif [ -z "$HAVE_APPNAME" -a "$1" = "-showversion" ]; then
>-                echo 'java version "@JAVA_VERSION@"' 1>&2
>-                gcj@gcc_suffix@ --version 1>&2
>+                # echo 'java version "@JAVA_VERSION@"' 1>&2
>+                gij --version | tr -s '\n' 1>&2
>         elif [ -z "$HAVE_APPNAME" -a $ "$1" = "-classpath" -o "$1" = "-cp" $ ]; then
>                 shift
>                 clp="`echo $1 | sed \"s~.*/lib/rt.jar~$libgcjjar~\"`"

Actions: View

Attachments on bug 157655: 73676