hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmcc...@apache.org
Subject svn commit: r1511935 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/JNIFlags.cmake
Date Thu, 08 Aug 2013 18:44:07 GMT
Author: cmccabe
Date: Thu Aug  8 18:44:06 2013
New Revision: 1511935

URL: http://svn.apache.org/r1511935
Log:
HADOOP-9435.  Support building the JNI code against the IBM JVM.  (Tian Hong Wang via Colin
Patrick McCabe)

Modified:
    hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1511935&r1=1511934&r2=1511935&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Aug  8 18:44:06 2013
@@ -11,6 +11,9 @@ Release 2.1.1-beta - UNRELEASED
     HADOOP-9787. ShutdownHelper util to shutdown threads and threadpools.
     (Karthik Kambatla via Sandy Ryza)
 
+    HADOOP-9435.  Support building the JNI code against the IBM JVM.
+    (Tian Hong Wang via Colin Patrick McCabe)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake?rev=1511935&r1=1511934&r2=1511935&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
Thu Aug  8 18:44:06 2013
@@ -95,8 +95,9 @@ IF("${CMAKE_SYSTEM}" MATCHES "Linux")
         NAMES jni.h 
         PATHS ${_JDK_DIRS}
         NO_DEFAULT_PATH)
+    #In IBM java, it's jniport.h instead of jni_md.h
     FIND_PATH(JAVA_INCLUDE_PATH2 
-        NAMES jni_md.h
+        NAMES jni_md.h jniport.h
         PATHS ${_JDK_DIRS}
         NO_DEFAULT_PATH)
     SET(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})



Mime
View raw message