Fix calculations about version for java

Desktop / LibreOffice - Tomáš Chvátal [suse.com] - 29 June 2018 13:58 EDT

This solves problem where java prints ton of warnings about too many CPUs which turned out to empty lines that are now ommited by the added sed command.

Change-Id: I552f40289e1d598f11f98509b9e9b0b867336c3b Reviewed-on: https://gerrit.libreoffice.org/55377

###

diff --git a/configure.ac b/configure.ac
index 7848658978f2..8955729e2328 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6853,7 +6853,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

62bfd24503d4 Fix calculations about version for java
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Upstream: cgit.freedesktop.org


  • Share