HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1505744 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
3eb61be352
commit
74906216fe
|
@ -298,6 +298,9 @@ Release 2.3.0 - UNRELEASED
|
||||||
HADOOP-9618. Add thread which detects GC pauses.
|
HADOOP-9618. Add thread which detects GC pauses.
|
||||||
(Todd Lipcon via Colin Patrick McCabe)
|
(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
|
OPTIMIZATIONS
|
||||||
|
|
||||||
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
|
HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
|
||||||
|
|
|
@ -95,8 +95,9 @@ IF("${CMAKE_SYSTEM}" MATCHES "Linux")
|
||||||
NAMES jni.h
|
NAMES jni.h
|
||||||
PATHS ${_JDK_DIRS}
|
PATHS ${_JDK_DIRS}
|
||||||
NO_DEFAULT_PATH)
|
NO_DEFAULT_PATH)
|
||||||
|
#In IBM java, it's jniport.h instead of jni_md.h
|
||||||
FIND_PATH(JAVA_INCLUDE_PATH2
|
FIND_PATH(JAVA_INCLUDE_PATH2
|
||||||
NAMES jni_md.h
|
NAMES jni_md.h jniport.h
|
||||||
PATHS ${_JDK_DIRS}
|
PATHS ${_JDK_DIRS}
|
||||||
NO_DEFAULT_PATH)
|
NO_DEFAULT_PATH)
|
||||||
SET(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
|
SET(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
|
||||||
|
|
|
@ -91,6 +91,8 @@ add_dual_library(hdfs
|
||||||
)
|
)
|
||||||
target_link_dual_libraries(hdfs
|
target_link_dual_libraries(hdfs
|
||||||
${JAVA_JVM_LIBRARY}
|
${JAVA_JVM_LIBRARY}
|
||||||
|
dl
|
||||||
|
pthread
|
||||||
)
|
)
|
||||||
dual_output_directory(hdfs target/usr/local/lib)
|
dual_output_directory(hdfs target/usr/local/lib)
|
||||||
set(LIBHDFS_VERSION "0.0.0")
|
set(LIBHDFS_VERSION "0.0.0")
|
||||||
|
|
Loading…
Reference in New Issue