Browse Source

HADOOP-3659. Patch to allow hadoop native to compile on Mac OS X. Contributed by Colin Evans and Allen Wittenauer.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@925468 13f79535-47bb-0310-9956-ffa450edef68
Thomas White 15 years ago
parent
commit
a0a4bf08d3
2 changed files with 6 additions and 1 deletions
  1. 3 0
      CHANGES.txt
  2. 3 1
      src/native/acinclude.m4

+ 3 - 0
CHANGES.txt

@@ -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(..).

+ 3 - 1
src/native/acinclude.m4

@@ -13,8 +13,10 @@ AC_CACHE_CHECK([Checking for the 'actual' dynamic-library for '-l$1'], ac_cv_lib
       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