jdk-1.8 bits for CMake
This commit is contained in:
dcoppa
parent
0eb98a7f4b
commit
803f09c5c3
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.127 2015/06/03 08:25:30 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.128 2015/06/24 06:39:03 dcoppa Exp $
|
||||
|
||||
DPB_PROPERTIES =parallel
|
||||
|
||||
@ -11,7 +11,7 @@ COMMENT = portable build system
|
||||
|
||||
VER = 3.2.3
|
||||
DISTNAME = cmake-${VER}
|
||||
|
||||
REVISION = 0
|
||||
CATEGORIES = devel
|
||||
|
||||
HOMEPAGE = http://www.cmake.org/
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $OpenBSD: cmake.port.mk,v 1.44 2015/06/03 08:25:30 dcoppa Exp $
|
||||
# $OpenBSD: cmake.port.mk,v 1.45 2015/06/24 06:39:03 dcoppa Exp $
|
||||
|
||||
BUILD_DEPENDS+= devel/cmake>=3.2.3
|
||||
BUILD_DEPENDS+= devel/cmake>=3.2.3p0
|
||||
|
||||
.for _n _v in ${SHARED_LIBS}
|
||||
CONFIGURE_ENV+=LIB${_n}_VERSION=${_v}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.11 2014/12/31 11:06:02 dcoppa Exp $
|
||||
--- Modules/CMakeDetermineJavaCompiler.cmake.orig Mon Dec 15 14:07:43 2014
|
||||
+++ Modules/CMakeDetermineJavaCompiler.cmake Thu Dec 18 05:37:11 2014
|
||||
$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.12 2015/06/24 06:39:03 dcoppa Exp $
|
||||
--- Modules/CMakeDetermineJavaCompiler.cmake.orig Mon Jun 1 17:56:08 2015
|
||||
+++ Modules/CMakeDetermineJavaCompiler.cmake Wed Jun 24 07:51:41 2015
|
||||
@@ -16,6 +16,8 @@
|
||||
# NOTE, a generator may set CMAKE_Java_COMPILER before
|
||||
# loading this file to force a compiler.
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.11 2014/12/31 11:06
|
||||
if(NOT CMAKE_Java_COMPILER)
|
||||
# prefer the environment variable CC
|
||||
if(NOT $ENV{JAVA_COMPILER} STREQUAL "")
|
||||
@@ -42,30 +44,33 @@ if(NOT CMAKE_Java_COMPILER)
|
||||
@@ -42,30 +44,38 @@ if(NOT CMAKE_Java_COMPILER)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -39,8 +39,12 @@ $OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.11 2014/12/31 11:06
|
||||
- /usr/local/jdk-1.6.0/bin
|
||||
- )
|
||||
+ if(MODJAVA_VER)
|
||||
+ set(Java_BIN_PATH ${LOCALBASE}/jdk-1.7.0/bin)
|
||||
+ else()
|
||||
+ if(MODJAVA_VER MATCHES "^1\\.8\\+?$")
|
||||
+ set(Java_BIN_PATH ${LOCALBASE}/jdk-1.8.0/bin)
|
||||
+ else()
|
||||
+ set(Java_BIN_PATH ${LOCALBASE}/jdk-1.7.0/bin)
|
||||
+ endif()
|
||||
+ else(MODJAVA_VER)
|
||||
+ set(Java_BIN_PATH
|
||||
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
|
||||
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
|
||||
@ -63,8 +67,9 @@ $OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.11 2014/12/31 11:06
|
||||
+ /usr/lib/j2sdk1.5-sun/bin
|
||||
+ /opt/sun-jdk-1.5.0.04/bin
|
||||
+ ${LOCALBASE}/jdk-1.7.0/bin
|
||||
+ ${LOCALBASE}/jdk-1.8.0/bin
|
||||
+ )
|
||||
+ endif()
|
||||
+ endif(MODJAVA_VER)
|
||||
# if no compiler has been specified yet, then look for one
|
||||
if(CMAKE_Java_COMPILER_INIT)
|
||||
set(CMAKE_Java_COMPILER ${CMAKE_Java_COMPILER_INIT} CACHE PATH "Java Compiler")
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.15 2015/03/26 07:10:02 dcoppa Exp $
|
||||
--- Modules/FindJNI.cmake.orig Tue Mar 10 09:38:44 2015
|
||||
+++ Modules/FindJNI.cmake Wed Mar 18 06:23:04 2015
|
||||
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.16 2015/06/24 06:39:03 dcoppa Exp $
|
||||
--- Modules/FindJNI.cmake.orig Mon Jun 1 17:56:08 2015
|
||||
+++ Modules/FindJNI.cmake Wed Jun 24 07:52:23 2015
|
||||
@@ -35,6 +35,8 @@
|
||||
# (To distribute this file outside of CMake, substitute the full
|
||||
# License text for the above reference.)
|
||||
@ -23,7 +23,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.15 2015/03/26 07:10:02 dcoppa Exp $
|
||||
endif()
|
||||
|
||||
# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
|
||||
@@ -109,51 +113,57 @@ if(_JAVA_HOME_EXPLICIT)
|
||||
@@ -109,51 +113,66 @@ if(_JAVA_HOME_EXPLICIT)
|
||||
set(CMAKE_FIND_FRAMEWORK NEVER)
|
||||
endif()
|
||||
|
||||
@ -31,16 +31,18 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.15 2015/03/26 07:10:02 dcoppa Exp $
|
||||
-if(_JAVA_HOME)
|
||||
+if(MODJAVA_VER)
|
||||
+ set(JAVA_AWT_LIBRARY_DIRECTORIES)
|
||||
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
- ${_JAVA_HOME}/jre/lib/{libarch}
|
||||
- ${_JAVA_HOME}/jre/lib
|
||||
- ${_JAVA_HOME}/lib/{libarch}
|
||||
- ${_JAVA_HOME}/lib
|
||||
- ${_JAVA_HOME}
|
||||
+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
|
||||
+ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
|
||||
)
|
||||
+else()
|
||||
+ if(MODJAVA_VER MATCHES "^1\\.8\\+?$")
|
||||
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
|
||||
+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
|
||||
+ )
|
||||
+ else()
|
||||
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
|
||||
+ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
|
||||
+ )
|
||||
+ endif()
|
||||
+else(MODJAVA_VER)
|
||||
+ set(JAVA_AWT_LIBRARY_DIRECTORIES)
|
||||
+ if(_JAVA_HOME)
|
||||
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
@ -59,7 +61,12 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.15 2015/03/26 07:10:02 dcoppa Exp $
|
||||
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
|
||||
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
|
||||
+ )
|
||||
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
- ${_JAVA_HOME}/jre/lib/{libarch}
|
||||
- ${_JAVA_HOME}/jre/lib
|
||||
- ${_JAVA_HOME}/lib/{libarch}
|
||||
- ${_JAVA_HOME}/lib
|
||||
- ${_JAVA_HOME}
|
||||
+ /usr/lib
|
||||
+ /usr/local/lib
|
||||
+ /usr/lib/jvm/java/lib
|
||||
@ -82,10 +89,13 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.15 2015/03/26 07:10:02 dcoppa Exp $
|
||||
+ # OpenBSD specific paths for default JVM
|
||||
+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
|
||||
+ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
|
||||
+ )
|
||||
endif()
|
||||
+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
|
||||
+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
|
||||
)
|
||||
-endif()
|
||||
-get_filename_component(java_install_version
|
||||
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
|
||||
+endif(MODJAVA_VER)
|
||||
|
||||
-list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
|
||||
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
|
||||
@ -122,19 +132,49 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.15 2015/03/26 07:10:02 dcoppa Exp $
|
||||
set(JAVA_JVM_LIBRARY_DIRECTORIES)
|
||||
foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
|
||||
list(APPEND JAVA_JVM_LIBRARY_DIRECTORIES
|
||||
@@ -163,33 +173,39 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
|
||||
@@ -163,33 +182,46 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
|
||||
)
|
||||
endforeach()
|
||||
|
||||
-set(JAVA_AWT_INCLUDE_DIRECTORIES)
|
||||
-if(_JAVA_HOME)
|
||||
- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
|
||||
-endif()
|
||||
-list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
|
||||
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
|
||||
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
|
||||
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
|
||||
- /usr/include
|
||||
- /usr/local/include
|
||||
- /usr/lib/java/include
|
||||
- /usr/local/lib/java/include
|
||||
- /usr/lib/jvm/java/include
|
||||
- /usr/lib/jvm/java-6-sun/include
|
||||
- /usr/lib/jvm/java-1.5.0-sun/include
|
||||
- /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
|
||||
- /usr/lib/jvm/java-6-openjdk/include
|
||||
- /usr/local/share/java/include
|
||||
- /usr/lib/j2sdk1.4-sun/include
|
||||
- /usr/lib/j2sdk1.5-sun/include
|
||||
- /opt/sun-jdk-1.5.0.04/include
|
||||
- # Debian specific path for default JVM
|
||||
- /usr/lib/jvm/default-java/include
|
||||
- # OpenBSD specific path for default JVM
|
||||
- /usr/local/jdk-1.7.0/include
|
||||
- /usr/local/jdk-1.6.0/include
|
||||
- )
|
||||
+if(MODJAVA_VER)
|
||||
+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
|
||||
+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
|
||||
+ ${LOCALBASE}/jdk-1.7.0/include
|
||||
+ )
|
||||
+else()
|
||||
+ if(MODJAVA_VER MATCHES "^1\\.8\\+?$")
|
||||
+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
|
||||
+ ${LOCALBASE}/jdk-1.8.0/include
|
||||
+ )
|
||||
+ else()
|
||||
+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
|
||||
+ ${LOCALBASE}/jdk-1.7.0/include
|
||||
+ )
|
||||
+ endif()
|
||||
+else(MODJAVA_VER)
|
||||
+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
|
||||
+ if(_JAVA_HOME)
|
||||
+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
|
||||
@ -160,31 +200,9 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.15 2015/03/26 07:10:02 dcoppa Exp $
|
||||
+ /usr/lib/jvm/default-java/include
|
||||
+ # OpenBSD specific path for default JVM
|
||||
+ ${LOCALBASE}/jdk-1.7.0/include
|
||||
+ ${LOCALBASE}/jdk-1.8.0/include
|
||||
+ )
|
||||
endif()
|
||||
-list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
|
||||
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
|
||||
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
|
||||
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
|
||||
- /usr/include
|
||||
- /usr/local/include
|
||||
- /usr/lib/java/include
|
||||
- /usr/local/lib/java/include
|
||||
- /usr/lib/jvm/java/include
|
||||
- /usr/lib/jvm/java-6-sun/include
|
||||
- /usr/lib/jvm/java-1.5.0-sun/include
|
||||
- /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
|
||||
- /usr/lib/jvm/java-6-openjdk/include
|
||||
- /usr/local/share/java/include
|
||||
- /usr/lib/j2sdk1.4-sun/include
|
||||
- /usr/lib/j2sdk1.5-sun/include
|
||||
- /opt/sun-jdk-1.5.0.04/include
|
||||
- # Debian specific path for default JVM
|
||||
- /usr/lib/jvm/default-java/include
|
||||
- # OpenBSD specific path for default JVM
|
||||
- /usr/local/jdk-1.7.0/include
|
||||
- /usr/local/jdk-1.6.0/include
|
||||
- )
|
||||
+endif(MODJAVA_VER)
|
||||
|
||||
foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
|
||||
get_filename_component(jpath "${JAVA_PROG}" PATH)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Modules_FindJava_cmake,v 1.15 2014/09/11 14:45:13 dcoppa Exp $
|
||||
--- Modules/FindJava.cmake.orig Thu Jul 31 17:03:56 2014
|
||||
+++ Modules/FindJava.cmake Wed Sep 3 08:10:09 2014
|
||||
$OpenBSD: patch-Modules_FindJava_cmake,v 1.16 2015/06/24 06:39:03 dcoppa Exp $
|
||||
--- Modules/FindJava.cmake.orig Mon Jun 1 17:56:08 2015
|
||||
+++ Modules/FindJava.cmake Wed Jun 24 07:52:35 2015
|
||||
@@ -71,6 +71,8 @@
|
||||
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.15 2014/09/11 14:45:13 dcoppa Exp $
|
||||
# The HINTS option should only be used for values computed from the system.
|
||||
set(_JAVA_HINTS)
|
||||
if(_JAVA_HOME)
|
||||
@@ -88,19 +90,22 @@ list(APPEND _JAVA_HINTS
|
||||
@@ -88,19 +90,27 @@ list(APPEND _JAVA_HINTS
|
||||
)
|
||||
# Hard-coded guesses should still go in PATHS. This ensures that the user
|
||||
# environment can always override hard guesses.
|
||||
@ -28,8 +28,12 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.15 2014/09/11 14:45:13 dcoppa Exp $
|
||||
- /usr/local/jdk-1.6.0/bin
|
||||
- )
|
||||
+if(MODJAVA_VER)
|
||||
+ set(_JAVA_PATHS ${LOCALBASE}/jdk-1.7.0/bin)
|
||||
+else()
|
||||
+ if(MODJAVA_VER MATCHES "^1\\.8\\+?$")
|
||||
+ set(_JAVA_PATHS ${LOCALBASE}/jdk-1.8.0/bin)
|
||||
+ else()
|
||||
+ set(_JAVA_PATHS ${LOCALBASE}/jdk-1.7.0/bin)
|
||||
+ endif()
|
||||
+else(MODJAVA_VER)
|
||||
+ set(_JAVA_PATHS
|
||||
+ /usr/lib/java/bin
|
||||
+ /usr/share/java/bin
|
||||
@ -41,8 +45,18 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.15 2014/09/11 14:45:13 dcoppa Exp $
|
||||
+ /usr/lib/j2sdk1.5-sun/bin
|
||||
+ /opt/sun-jdk-1.5.0.04/bin
|
||||
+ ${LOCALBASE}/jdk-1.7.0/bin
|
||||
+ ${LOCALBASE}/jdk-1.8.0/bin
|
||||
+ )
|
||||
+endif()
|
||||
+endif(MODJAVA_VER)
|
||||
find_program(Java_JAVA_EXECUTABLE
|
||||
NAMES java
|
||||
HINTS ${_JAVA_HINTS}
|
||||
@@ -137,7 +147,7 @@ if(Java_JAVA_EXECUTABLE)
|
||||
elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
|
||||
# Kaffe style
|
||||
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
|
||||
- elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
|
||||
+ elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+.*)\"")
|
||||
# OpenJDK ver 1.7.x on OpenBSD
|
||||
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
|
||||
else()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user