Fix detection of OpenJDK 9 early access builds.

Closes: #868327
This commit is contained in:
Felix Geyer 2017-07-25 18:14:01 +02:00
parent 1c988fd87e
commit 8b36be9871
3 changed files with 30 additions and 0 deletions

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ cmake (3.9.0-1) UNRELEASED; urgency=medium
* Drop ancient Breaks/Replaces/Conflicts.
* No longer suggest eclipse and codeblocks. (Closes: #750465)
* Add Python and Java to findmodules autopkgtest.
* Fix detection of OpenJDK 9 early access builds. (Closes: #868327)
- Add fix-java9-detection.patch
-- Felix Geyer <fgeyer@debian.org> Thu, 20 Jul 2017 19:39:13 +0200

View File

@ -0,0 +1,27 @@
From e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e Mon Sep 17 00:00:00 2001
From: Craig Scott <craig.scott@crascit.com>
Date: Tue, 25 Jul 2017 22:23:55 +1000
Subject: [PATCH] Allow early access version trailing string to be mixed case
The original regex was expecting to match strings like "ea", but it has
been reported that other strings like "Debian" are also possible.
---
Modules/FindJava.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 3d32560..d762452 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -143,7 +143,7 @@ if(Java_JAVA_EXECUTABLE)
if(var MATCHES "java version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\"")
# This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
- elseif(var MATCHES "openjdk version \"([0-9]+)-[a-z]+\"")
+ elseif(var MATCHES "openjdk version \"([0-9]+)-[A-Za-z]+\"")
# OpenJDK 9 early access builds or locally built
set(Java_VERSION_STRING "1.${CMAKE_MATCH_1}.0")
elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
--
libgit2 0.25.0

View File

@ -1,3 +1,4 @@
FindBoost_add_-lpthread_#563479.diff
qt_import_dir_variable.diff
fix-ftbfs-on-kfreebsd.patch
fix-java9-detection.patch