You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dd...@apache.org on 2012/03/20 00:33:10 UTC
svn commit: r1302721 - in /hadoop/common/branches/branch-1.0: ./ CHANGES.txt
src/mapred/ src/native/configure src/native/configure.ac
Author: ddas
Date: Mon Mar 19 23:33:10 2012
New Revision: 1302721
URL: http://svn.apache.org/viewvc?rev=1302721&view=rev
Log:
merge -r 1302719:1302720 from branch-1 onto branch-1.0. Fixes HADOOP-6924.
Modified:
hadoop/common/branches/branch-1.0/ (props changed)
hadoop/common/branches/branch-1.0/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.0/src/mapred/ (props changed)
hadoop/common/branches/branch-1.0/src/native/configure
hadoop/common/branches/branch-1.0/src/native/configure.ac
Propchange: hadoop/common/branches/branch-1.0/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1302720
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1302721&r1=1302720&r2=1302721&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Mon Mar 19 23:33:10 2012
@@ -1,5 +1,10 @@
Hadoop Change 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. (Stephen Watt,
+ Guillermo Cabrera and ddas)
+
Release 1.0.2 - 2012.03.18
NEW FEATURES
Propchange: hadoop/common/branches/branch-1.0/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1302720
Propchange: hadoop/common/branches/branch-1.0/src/mapred/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/src/mapred:r1302720
Modified: hadoop/common/branches/branch-1.0/src/native/configure
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/native/configure?rev=1302721&r1=1302720&r2=1302721&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/native/configure (original)
+++ hadoop/common/branches/branch-1.0/src/native/configure Mon Mar 19 23:33:10 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.0/src/native/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/native/configure.ac?rev=1302721&r1=1302720&r2=1302721&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/native/configure.ac (original)
+++ hadoop/common/branches/branch-1.0/src/native/configure.ac Mon Mar 19 23:33:10 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"