67cf8aafbd
* 6.1 series first beta, many fixes and features around * Notably kde5_gtk3 integration, on by default now - Remove merged patches: * 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch * libreoffice-icu61.patch * kde5-configure-checks.patch * bnc1060128.patch * bnc1039203.patch - Disable firebird everywhere for now as it causes issues - Try to implement safeguarding to avoid bsc#1050305 - Disable base-drivers-mysql as it needs mysqlcppcon that is only for mysql and not mariadb, causes issues bsc#1094779 * Users can still connect using jdbc/odbc - Fix java detection on machines with too many cpus * libreoffice-java-sched.patch - Remove galaxy icon theme replaced by colibri - Add karasa jaga icon theme OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=661
14 lines
632 B
Diff
14 lines
632 B
Diff
diff --git a/configure.ac b/configure.ac
|
|
index aa44107f8e79..8a40119e9bc6 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -6824,7 +6824,7 @@ you must use the "--with-jdk-home" configure option explicitly])
|
|
JDK=sun
|
|
|
|
dnl Sun JDK specific tests
|
|
- _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
|
|
+ _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//`
|
|
_jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
|
|
|
|
if test "$_jdk_ver" -lt 10600; then
|