hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmcc...@apache.org
Subject svn commit: r1505744 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/JNIFlags.cmake
Date Mon, 22 Jul 2013 17:52:03 GMT
Author: cmccabe
Date: Mon Jul 22 17:52:03 2013
New Revision: 1505744

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

Modified:
    hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/trunk/hadoop-common-project/hadoop-common/src/JNIFlags.cmake

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1505744&r1=1505743&r2=1505744&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jul 22 17:52:03
2013
@@ -298,6 +298,9 @@ Release 2.3.0 - UNRELEASED
     HADOOP-9618.  Add thread which detects GC pauses.
     (Todd Lipcon via Colin Patrick McCabe)
 
+    HADOOP-9435.  Support building the JNI code against the IBM JVM.
+    (Tian Hong Wang via Colin Patrick McCabe)
+
   OPTIMIZATIONS
 
     HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/JNIFlags.cmake
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/JNIFlags.cmake?rev=1505744&r1=1505743&r2=1505744&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/JNIFlags.cmake (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/JNIFlags.cmake Mon Jul 22
17:52:03 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