strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Easy hack: remove obsolete gjc aot compilation

Browse source
This commit is contained in:
Thomas Arnhold 2011-02-12 11:58:01 +01:00
parent 09441fd8cc
commit 7387cd7edb
3 changed files with 1 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.cmd
View file

@ -3,5 +3,5 @@ setlocal
SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0
SET JAVA_HOME=e:\java150
SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=bash --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=bash --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log
endlocal

39
configure.in
View file

@ -397,13 +397,6 @@ AC_ARG_ENABLE(Xaw,
[Disables the use of Xaw for the Netscape/Mozilla plugin.]),
,)
AC_ARG_ENABLE(gcjaot,
AS_HELP_STRING([--enable-gcjaot],
[Build with[[out]] using Ahead of Time java compilation support to speed
up buildsi by compiling the jars also to native code.. --enable-gcjaot
is only known to work with bytecode created with gcj or ecj.]),
,)
AC_ARG_ENABLE(check-only,
AS_HELP_STRING([--enable-check-only],
[Use this option option if you just want to check your environment.
@ -3548,37 +3541,6 @@ if test "$SOLAR_JAVA" != ""; then
AC_SUBST(AWTLIB)
fi
dnl ===================================================================
dnl Check for optional gcj for AOT
dnl ===================================================================
if test "$SOLAR_JAVA" != ""; then
AC_MSG_CHECKING([whether to enable gcj aot compilation])
if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
AC_MSG_RESULT([yes])
if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
gcjaot="gcj"
else
gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
fi
AC_MSG_RESULT([$gcjaot])
if test -n "$with_jdk_home"; then
_javac_path="$with_jdk_home/bin/$gcjaot"
dnl Check if there is a gcj at all.
if test -x "$_javac_path"; then
JAVAAOTCOMPILER=$_javac_path
fi
fi
if test -z "$JAVAAOTCOMPILER"; then
AC_PATH_PROG(JAVAAOTCOMPILER, $gcjaot)
fi
if test -z "$JAVAAOTCOMPILER"; then
AC_MSG_WARN([$gcjaot not found, set with_jdk_home])
fi
else
AC_MSG_RESULT([no])
fi
fi
AC_SUBST(JAVA_HOME)
AC_SUBST(JDK)
AC_SUBST(JAVAFLAGS)
@ -3587,7 +3549,6 @@ AC_SUBST(JAVA_TARGET_VER)
AC_SUBST(JAVAINTERPRETER)
AC_SUBST(JAVAIFLAGS)
AC_SUBST(JAVACOMPILER)
AC_SUBST(JAVAAOTCOMPILER)
AC_SUBST(JAVADOC)
dnl ===================================================================

1
set_soenv.in
View file

@ -1786,7 +1786,6 @@ if ( '@JDK@' ne '' )
ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" );
ToFile( "JAVAIFLAGS", "@JAVAIFLAGS@", "e" );
ToFile( "JAVACOMPILER", PathFormat("@JAVACOMPILER@"), "e" );
ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" );
ToFile( "JAVADOC", PathFormat("@JAVADOC@"), "e" );
}
ToFile( "SCPDEFS", '@SCPDEFS@', "e" );