View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

FindJNI.cmake-arch-indep.diff [^] (4,726 bytes) 2009-09-28 15:22 [Show Content] [Hide Content]

Index: Modules/FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.42
diff -u -r1.42 FindJNI.cmake
--- Modules/FindJNI.cmake	28 Sep 2009 15:45:33 -0000	1.42
+++ Modules/FindJNI.cmake	28 Sep 2009 19:19:14 -0000
@@ -25,6 +25,40 @@
 # (To distributed this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
+# Expand $libarch occurences to java_libarch subdirectory(-ies) and set ${_var}
+MACRO(java_append_library_directories _var)
+    # Determine java arch-specific library subdir
+    IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
+        # Based on openjdk/jdk/make/common/shared/Platform.gmk as of 6b16
+        # and kaffe as of 1.1.8 which uses the first part of the
+        # GNU config.guess platform triplet.
+        IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
+            SET(_java_libarch "i386")
+        ELSEIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+            SET(_java_libarch "amd64" "x86_64")
+        ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc")
+            SET(_java_libarch "ppc" "powerpc" "ppc64")
+        ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
+            SET(_java_libarch "sparc" "sparcv9")
+        ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
+            SET(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}")
+        ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i[3-9]86$")
+    ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        SET(_java_libarch "i386" "amd64" "ppc") # previous default
+    ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+    FOREACH(_path ${ARGN})
+        IF(_path MATCHES "{libarch}")
+            FOREACH(_libarch ${_java_libarch})
+                STRING(REPLACE "{libarch}" "${_libarch}" _newpath "${_path}")
+                LIST(APPEND ${_var} "${_newpath}")
+            ENDFOREACH(_libarch)
+        ELSE(_path MATCHES "{libarch}")
+            LIST(APPEND ${_var} "${_path}")
+        ENDIF(_path MATCHES "{libarch}")
+    ENDFOREACH(_path)
+ENDMACRO(java_append_library_directories)
+
 GET_FILENAME_COMPONENT(java_install_version
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
 
@@ -32,45 +66,28 @@
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
   "[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"
-  $ENV{JAVA_HOME}/jre/lib/alpha
-  $ENV{JAVA_HOME}/jre/lib/amd64
-  $ENV{JAVA_HOME}/jre/lib/arm
-  $ENV{JAVA_HOME}/jre/lib/i386
-  $ENV{JAVA_HOME}/jre/lib/ia64
-  $ENV{JAVA_HOME}/jre/lib/m68k
-  $ENV{JAVA_HOME}/jre/lib/mips
-  $ENV{JAVA_HOME}/jre/lib/mipsel
-  $ENV{JAVA_HOME}/jre/lib/parisc
-  $ENV{JAVA_HOME}/jre/lib/powerpc
-  $ENV{JAVA_HOME}/jre/lib/ppc
-  $ENV{JAVA_HOME}/jre/lib/s390
-  $ENV{JAVA_HOME}/jre/lib/sparc
-  $ENV{JAVA_HOME}/jre/lib/x86_64
+  )
+JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+  $ENV{JAVA_HOME}/jre/lib/{libarch}
+  $ENV{JAVA_HOME}/jre/lib
   $ENV{JAVA_HOME}/lib
+  $ENV{JAVA_HOME}
   /usr/lib
   /usr/local/lib
   /usr/lib/jvm/java/lib
-  /usr/lib/java/jre/lib/i386
-  /usr/local/lib/java/jre/lib/i386
-  /usr/local/share/java/jre/lib/i386
-  /usr/lib/j2sdk1.4-sun/jre/lib/i386
-  /usr/lib/j2sdk1.5-sun/jre/lib/i386
-  /opt/sun-jdk-1.5.0.04/jre/lib/amd64
-  /usr/lib/jvm/java-6-sun/jre/lib/i386
-  /usr/lib/jvm/java-6-sun/jre/lib/amd64
-  /usr/lib/jvm/java-1.5.0-sun/jre/lib/i386
-  /usr/lib/jvm/java-1.5.0-sun/jre/lib/amd64
-  /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64       # can this one be removed according to #8821 ? Alex
-  /usr/lib/java/jre/lib/amd64
-  /usr/local/lib/java/jre/lib/amd64
-  /usr/local/share/java/jre/lib/amd64
-  /usr/lib/j2sdk1.4-sun/jre/lib/amd64
-  /usr/lib/j2sdk1.5-sun/jre/lib/amd64
-  /usr/lib/java/jre/lib/ppc
-  /usr/local/lib/java/jre/lib/ppc
-  /usr/local/share/java/jre/lib/ppc
-  /usr/lib/j2sdk1.4-sun/jre/lib/ppc
-  /usr/lib/j2sdk1.5-sun/jre/lib/ppc
+  /usr/lib/java/jre/lib/{libarch}
+  /usr/local/lib/java/jre/lib/{libarch}
+  /usr/local/share/java/jre/lib/{libarch}
+  /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
+  /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
+  /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
+  /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
+  /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
+  /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed according to #8821 ? Alex
+  # Debian specific paths for default JVM
+  /usr/lib/jvm/default-java/jre/lib/{libarch}
+  /usr/lib/jvm/default-java/jre/lib
+  /usr/lib/jvm/default-java/lib
   )
 
 SET(JAVA_JVM_LIBRARY_DIRECTORIES)

FindJNI.cmake-includes-openjdk.diff [^] (1,679 bytes) 2009-09-30 14:02 [Show Content] [Hide Content]

Index: Modules/FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.43
diff -u -r1.43 FindJNI.cmake
--- Modules/FindJNI.cmake	30 Sep 2009 13:59:00 -0000	1.43
+++ Modules/FindJNI.cmake	30 Sep 2009 17:53:33 -0000
@@ -25,7 +25,7 @@
 # (To distributed this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-# Expand $libarch occurences to java_libarch subdirectory(-ies) and set ${_var}
+# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
 MACRO(java_append_library_directories _var)
     # Determine java arch-specific library subdir
     IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -84,6 +84,7 @@
   /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
   /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed according to #8821 ? Alex
+  /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
   # Debian specific paths for default JVM
   /usr/lib/jvm/default-java/jre/lib/{libarch}
   /usr/lib/jvm/default-java/jre/lib
@@ -114,10 +115,13 @@
   /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
   )
 
 FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")

Relationships

related to

0009777

closed

Mathieu Malaterre

FindJNI update not found in FindJava / CMakeDetermineJavaCompiler

Notes
(0017841) Bill Hoffman (manager) 2009-09-30 09:59	cvs commit -m "Fix for bug 0009611 do not hard code archs for search paths of java, look at the machine type." FindJNI.cmake Committer: Bill Hoffman <bill.hoffman@kitware.com> /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v <-- FindJNI.cmake new revision: 1.43; previous revision: 1.42 Let me know if this works for you folks and I will close the bug. Thanks.

(0017842) Bill Hoffman (manager) 2009-09-30 09:59	Either of you want to be the maintainer for this module?

(0017850) Modestas Vainius (reporter) 2009-09-30 14:01	I have no particular interest in Java. OpenJDK is available for many architectures on Debian and I had to fix FindJNI.cmake to support them. And I typically try to make fixes as portable as possible. What is more, I attach another patch which adds a few paths to include search and really adds OpenJDK 6 paths this time. Once you commit it, feel free to close the bug. I'll reopen if a problem on a "weird" arch arises.

(0017851) Bill Hoffman (manager) 2009-09-30 14:15	cvs commit -m "Fix for bug 0009611, some more paths for OpenJDK." FindJNI.cmake Committer: Bill Hoffman <bill.hoffman@kitware.com> /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v <-- FindJNI.cmake new revision: 1.44; previous revision: 1.43

(0021140) Modestas Vainius (reporter) 2010-06-22 18:06	I reopen the issue because apparently my previous patch was not complete. Here I link [1] another attempt which has finally worked on all debian architectures after many trail & error cases. The patch applies cleanly against 2.8.2-rc3. It has been in debian in its current state for a month without any reported regressions. [1] http://git.debian.org/?p=collab-maint/cmake.git;a=blob;f=debian/patches/FindJNI_fix_libarch_determination.diff [^]

(0021142) Mathieu Malaterre (developer) 2010-06-22 22:13	I volonteer to merge the change in cmake in case Modestas is not a cmake developer. The proposed changes works nicely in GDCM.

(0021570) Mathieu Malaterre (developer) 2010-07-30 04:28	Fixed in next: http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=963921f2a86a6cfa78c86dc7127ca117f540f199 [^]

(0022174) David Cole (manager) 2010-09-09 23:53	also merged into master... expect fix in 2.8.3

Issue History
Date Modified	Username	Field	Change
2009-09-28 15:22	Modestas Vainius	New Issue
2009-09-28 15:22	Modestas Vainius	File Added: FindJNI.cmake-arch-indep.diff
2009-09-30 09:59	Bill Hoffman	Note Added: 0017841
2009-09-30 09:59	Bill Hoffman	Status	new => assigned
2009-09-30 09:59	Bill Hoffman	Assigned To	=> Bill Hoffman
2009-09-30 09:59	Bill Hoffman	Note Added: 0017842
2009-09-30 14:01	Modestas Vainius	Note Added: 0017850
2009-09-30 14:02	Modestas Vainius	File Added: FindJNI.cmake-includes-openjdk.diff
2009-09-30 14:15	Bill Hoffman	Note Added: 0017851
2009-09-30 14:15	Bill Hoffman	Status	assigned => closed
2009-09-30 14:15	Bill Hoffman	Resolution	open => fixed
2009-10-26 05:01	Mathieu Malaterre	Relationship added	related to 0009777
2010-06-22 18:06	Modestas Vainius	Note Added: 0021140
2010-06-22 18:06	Modestas Vainius	Status	closed => feedback
2010-06-22 18:06	Modestas Vainius	Resolution	fixed => reopened
2010-06-22 22:13	Mathieu Malaterre	Note Added: 0021142
2010-07-29 11:36	Brad King	Status	feedback => assigned
2010-07-29 11:36	Brad King	Assigned To	Bill Hoffman => Mathieu Malaterre
2010-07-30 04:28	Mathieu Malaterre	Note Added: 0021570
2010-08-28 10:19	Kovarththanan Rajaratnam	Category	CMake => Modules
2010-09-09 23:53	David Cole	Fixed in Version	=> CMake 2.8.3
2010-09-09 23:53	David Cole	Target Version	=> CMake 2.8.3
2010-09-09 23:53	David Cole	Note Added: 0022174
2010-09-09 23:53	David Cole	Status	assigned => resolved
2010-09-09 23:53	David Cole	Resolution	reopened => fixed
2010-11-09 22:57	Philip Lowman	Status	resolved => closed