mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: reject Apple JDK

Browse Source 
Since commit 32bc8ddbf3 the jvmfwk rejects
Apple JDK and while the Java code builds fine with it, various tests such as
CppunitTest_dbaccess_hsqldb_test fail if it is the only installed JRE.

The simplest way to avoid the problem is to not allow building with
Apple JDK.

Change-Id: I5701e38cffded4596ac94608867a038ff76f75ec
This commit is contained in:
Michael Stahl
2016-09-27 11:53:56 +02:00
parent 9a5b10544a
commit 16c0807d75
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -7100,6 +7100,13 @@ _ACEOF
# now check if $JAVA_HOME is really valid # now check if $JAVA_HOME is really valid
if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
case "${JAVA_HOME}" in
/Library/Java/JavaVirtualMachines/*)
;;
*)
AC_MSG_ERROR([JDK in $JAVA_HOME cannot be used in CppUnit tests - install Oracle JDK])
;;
esac
if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
JAVA_HOME_OK="NO" JAVA_HOME_OK="NO"
fi fi