Author: ddas
Date: Mon Mar 19 23:02:31 2012
New Revision: 1302704
URL: http://svn.apache.org/viewvc?rev=1302704&view=rev
Log:
HADOOP-6924. Adds a directory to the list of directories to search for the
libjvm.so file. The new directory is found by running a 'find' command and the
first output is taken. This was done to handle the build of Hadoop with IBM's
JDK. Contributed by Stephen Watt, Guillermo Cabrera and Devaraj Das.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/configure.ac
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=1302704&r1=1302703&r2=1302704&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Mar
19 23:02:31 2012
@@ -52,6 +52,11 @@ Trunk (unreleased changes)
HADOOP-7994. Remove getProtocolVersion and getProtocolSignature from the
client side translator and server side implementation. (jitendra)
+ HADOOP-6924. Adds a directory to the list of directories to search
+ for the libjvm.so file. The new directory is found by running a 'find'
+ command and the first output is taken. This was done to handle the
+ build of Hadoop with IBM's JDK. (Stephen Watt, Guillermo Cabrera and ddas)
+
BUG FIXES
HADOOP-8177. MBeans shouldn't try to register when it fails to create
MBeanName.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/configure.ac
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/configure.ac?rev=1302704&r1=1302703&r2=1302704&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/configure.ac
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/configure.ac
Mon Mar 19 23:02:31 2012
@@ -57,6 +57,8 @@ JNI_LDFLAGS=""
if test $JAVA_HOME != ""
then
JNI_LDFLAGS="-L$JAVA_HOME/jre/lib/$OS_ARCH/server"
+ JVMSOPATH=`find $JAVA_HOME/jre/ -name libjvm.so | head -n 1`
+ JNI_LDFLAGS="$JNI_LDFLAGS -L`dirname $JVMSOPATH`"
fi
LDFLAGS="$LDFLAGS $JNI_LDFLAGS"
AC_CHECK_LIB([jvm], [JNI_GetCreatedJavaVMs])
