Author: tomwhite
Date: Fri Mar 19 22:51:29 2010
New Revision: 925468
URL: http://svn.apache.org/viewvc?rev=925468&view=rev
Log:
HADOOP-3659. Patch to allow hadoop native to compile on Mac OS X. Contributed
by Colin Evans and Allen Wittenauer.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/native/acinclude.m4
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=925468&r1=925467&r2=925468&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Fri Mar 19 22:51:29 2010
@@ -196,6 +196,9 @@ Trunk (unreleased changes)
HADOOP-6407. Have a way to automatically update Eclipse .classpath file
when new libs are added to the classpath through Ivy. (tomwhite)
+ HADOOP-3659. Patch to allow hadoop native to compile on Mac OS X.
+ (Colin Evans and Allen Wittenauer via tomwhite)
+
OPTIMIZATIONS
HADOOP-6467. Improve the performance on HarFileSystem.listStatus(..).
Modified: hadoop/common/trunk/src/native/acinclude.m4
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/src/native/acinclude.m4?rev=925468&r1=925467&r2=925468&view=diff
==============================================================================
--- hadoop/common/trunk/src/native/acinclude.m4 (original)
+++ hadoop/common/trunk/src/native/acinclude.m4 Fri Mar 19 22:51:29 2010
@@ -13,8 +13,10 @@ AC_CACHE_CHECK([Checking for the 'actual
ac_cv_libname_$1="`objdump -p conftest | grep NEEDED | grep $1 | sed
's/\W*NEEDED\W*\(.*\)\W*$/\"\1\"/'`"
elif test ! -z "`which ldd | grep -v 'no ldd'`"; then
ac_cv_libname_$1="`ldd conftest | grep $1 | sed
's/^[[[^A-Za-z0-9]]]*\([[[A-Za-z0-9\.]]]*\)[[[^A-Za-z0-9]]]*=>.*$/\"\1\"/'`"
+ elif test ! -z "`which otool | grep -v 'no otool'`"; then
+ ac_cv_libname_$1=\"`otool -L conftest | grep $1 | sed -e 's/^[ ]*//'
-e 's/ .*//' -e 's/.*\/\(.*\)$/\1/'`\";
else
- AC_MSG_ERROR(Can't find either 'objdump' or 'ldd' to compute the dynamic
library for '-l$1')
+ AC_MSG_ERROR(Can't find either 'objdump' or 'ldd' or 'otool' to compute
the dynamic library for '-l$1')
fi
else
ac_cv_libname_$1=libnotfound.so
