openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File J7Z-jdk10.patch of Package J7Z

--- J7Z/Linux/Build/Makefile	2018-02-02 07:37:38.602000593 +0100
+++ J7Z/Linux/Build/Makefile	2018-02-02 07:41:05.712654242 +0100
@@ -69,7 +69,7 @@
 # Java
 Java = $(shell which java 2> /dev/null)
 ifneq "$(Java)" ""
-	Java-Ver = $(shell $(Java) -version 2>&1 | grep -v "^Picked up _JAVA_OPTIONS:" | awk 'NR==1{print $$3}' | sed -e 's/^"//' -e 's/"$$//' | cut -c 1-3)
+	Java-Ver = $(shell $(Java) -version 2>&1 | grep -v "^Picked up _JAVA_OPTIONS:" | awk 'NR==1{print $$3}' | sed -e 's/^"//' -e 's/"$$//' | cut -c 1-4 | sed 's/\.//2')
 	Java-Major := $(shell echo $(Java-Ver) | cut -f1 -d.)
 	Java-Minor := $(shell echo $(Java-Ver) | cut -f2 -d.)
 	Java-OK := $(shell [ $(Java-Major) -gt 1 -o $ $(Java-Major) -eq 1 -a $(Java-Minor) -ge 7 $ ] && echo true)
@@ -78,7 +78,7 @@
 # Java compiler
 JavaC = $(shell which javac 2> /dev/null)
 ifneq "$(JavaC)" ""
-	JavaC-Ver = $(shell $(JavaC) -version 2>&1 | grep -v "^Picked up _JAVA_OPTIONS:" | awk 'NR==1{print $$2}' | sed -e 's/^"//' -e 's/"$$//' | cut -c 1-3)
+	JavaC-Ver = $(shell $(JavaC) -version 2>&1 | grep -v "^Picked up _JAVA_OPTIONS:" | awk 'NR==1{print $$2}' | sed -e 's/^"//' -e 's/"$$//' | cut -c 1-4 | sed 's/\.//2')
 endif
 
 # Apache Ant

Places

File J7Z-jdk10.patch of Package J7Z

Places