configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bc44e0acef79a2c0d4f0504023be21bd78451214
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Jul 27 21:20:07 2020 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Wed Jul 29 17:15:34 2020 +0200
WIN fix detection of user-passed, wrong 32bit JDK
If you pass an explicit JDK using --with-jdk-home, this would
always test the registry value for the 32 bit test.
Change-Id: If295964c5a594af26fa98ba9f4b302a6c8e7e45a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99686
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/configure.ac b/configure.ac
index 44f89e12f770..7bbb44e5ab60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7529,11 +7529,11 @@ if test "$ENABLE_JAVA" != ""; then
if test -n "$regvalue"; then
ver=$regvalue
reg_get_value "$bitness"
"HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/$ver/JavaHome"
- _jdk_home=$regvalue
+ reg_jdk_home=$regvalue
fi
- if test -f "$_jdk_home/lib/jvm.lib" -a -f
"$_jdk_home/bin/java.exe"; then
- with_jdk_home="$_jdk_home"
+ if test -f "$reg_jdk_home/lib/jvm.lib" -a -f
"$reg_jdk_home/bin/java.exe"; then
+ with_jdk_home="$reg_jdk_home"
howfound="found automatically"
else
AC_MSG_ERROR([No JDK found, pass the --with-jdk-home option
pointing to a $bitness-bit JDK >= 9])
@@ -7571,7 +7571,7 @@ if test "$ENABLE_JAVA" != ""; then
if test "$BITNESS_OVERRIDE" = 64 -a -f "$with_jdk_home/bin/java.exe"
-a "`$shortjdkhome/bin/java.exe -version 2>&1 | $GREP -i 64-bit`" = ""
>/dev/null; then
AC_MSG_WARN([You are building 64-bit binaries but the JDK
$howfound is 32-bit])
AC_MSG_ERROR([You should pass the --with-jdk-home option pointing
to a 64-bit JDK])
- elif test "$BITNESS_OVERRIDE" = "" -a -f "$_jdk_home/bin/java.exe" -a
"`$shortjdkhome/bin/java.exe -version 2>&1 | $GREP -i 64-bit`" != ""
>/dev/null; then
+ elif test "$BITNESS_OVERRIDE" = "" -a -f "$with_jdk_home/bin/java.exe"
-a "`$shortjdkhome/bin/java.exe -version 2>&1 | $GREP -i 64-bit`" != ""
>/dev/null; then
AC_MSG_WARN([You are building 32-bit binaries but the JDK
$howfound is 64-bit])
AC_MSG_ERROR([You should pass the --with-jdk-home option pointing
to a (32-bit) JDK])
fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
