Author: ddas
Date: Mon Mar 19 23:31:28 2012
New Revision: 1302720
URL: http://svn.apache.org/viewvc?rev=1302720&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/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/native/configure
hadoop/common/branches/branch-1/src/native/configure.ac
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1302720&r1=1302719&r2=1302720&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Mar 19 23:31:28 2012
@@ -163,6 +163,11 @@ Release 1.1.0 - unreleased
MAPREDUCE-2835. Make per-job counter limits configurable. (tomwhite)
+ 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)
+
Release 1.0.2 - 2012.03.18
NEW FEATURES
Modified: hadoop/common/branches/branch-1/src/native/configure
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/native/configure?rev=1302720&r1=1302719&r2=1302720&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/native/configure (original)
+++ hadoop/common/branches/branch-1/src/native/configure Mon Mar 19 23:31:28
2012
@@ -19777,6 +19777,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_bak=$LDFLAGS
LDFLAGS="$LDFLAGS $JNI_LDFLAGS"
Modified: hadoop/common/branches/branch-1/src/native/configure.ac
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/native/configure.ac?rev=1302720&r1=1302719&r2=1302720&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/native/configure.ac (original)
+++ hadoop/common/branches/branch-1/src/native/configure.ac Mon Mar 19 23:31:28
2012
@@ -55,6 +55,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_bak=$LDFLAGS
LDFLAGS="$LDFLAGS $JNI_LDFLAGS"
