diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 92bdaaa0f2..98fb3f5953 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -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) diff --git a/hadoop-common-project/hadoop-common/src/JNIFlags.cmake b/hadoop-common-project/hadoop-common/src/JNIFlags.cmake index aba4c18856..8333285f2f 100644 --- a/hadoop-common-project/hadoop-common/src/JNIFlags.cmake +++ b/hadoop-common-project/hadoop-common/src/JNIFlags.cmake @@ -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}) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt index 7b1f1b2175..5652892798 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/src/CMakeLists.txt @@ -91,6 +91,8 @@ add_dual_library(hdfs ) target_link_dual_libraries(hdfs ${JAVA_JVM_LIBRARY} + dl + pthread ) dual_output_directory(hdfs target/usr/local/lib) set(LIBHDFS_VERSION "0.0.0")