List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:December 4 2012 5:45pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4136 to 4137)
View as plain text  
 4137 magnus.blaudd@stripped	2012-12-04
      ndb
       - deduce JAVA_HOME from JAVA_COMPILE(path to javac) instead of JAVA_RUNTIME
         since the latter may be part of jre and not jdk
       - "symlink hell"

    modified:
      storage/ndb/CMakeLists.txt
 4136 magnus.blaudd@stripped	2012-12-04
      ndb
       - help FindJNI by setting JAVA_HOME to point at the java just found

    modified:
      storage/ndb/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2012-12-04 15:08:14 +0000
+++ b/storage/ndb/CMakeLists.txt	2012-12-04 17:44:35 +0000
@@ -252,11 +252,12 @@ IF(WITH_NDB_JAVA)
   # to point at the java found above
   IF(NOT DEFINED ENV{JAVA_HOME})
     # Convert to realpath
-    GET_FILENAME_COMPONENT(java_home ${JAVA_RUNTIME} REALPATH)
+    GET_FILENAME_COMPONENT(java_home ${JAVA_COMPILE} REALPATH)
     # Remove filename
     GET_FILENAME_COMPONENT(java_home ${java_home} PATH)
     # Remove dir
     GET_FILENAME_COMPONENT(java_home ${java_home} PATH)
+    MESSAGE(STATUS "Setting JAVA_HOME=${java_home}")
     SET(ENV{JAVA_HOME} ${java_home})
   ENDIF()
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4136 to 4137) magnus.blaudd4 Dec