casa-mp-base

--- src/contrib/fuse-dfs/build.xml.orig 2012-09-08 22:38:18.000000000 +0900

+++ src/contrib/fuse-dfs/build.xml  2012-09-08 02:02:14.000000000 +0900

@@ -39,9 +39,9 @@

         </exec>

     <property name="build.platform" 

             value="${nonspace.os}-${os.arch}-${sun.arch.data.model}"/>

-    <property name="libhdfs.lib" value="${hadoop.root}/build/c++/${build.platform}/lib/libhdfs.so"/>

+    <property name="libhdfs.lib" value="${hadoop.root}/build/c++/${build.platform}/lib/libhdfs.dylib"/>

         <available file="${libhdfs.lib}" property="libhdfs-exists"/>

-    <fail message="libhdfs.so does not exist: ${libhdfs.lib}. Please check flags -Dlibhdfs=1 -Dfusedfs=1 are set or first try ant compile-libhdfs -Dlibhdfs=1">

+    <fail message="libhdfs.dylib does not exist: ${libhdfs.lib}. Please check flags -Dlibhdfs=1 -Dfusedfs=1 are set or first try ant compile-libhdfs -Dlibhdfs=1">

          <condition>

             <not><isset property="libhdfs-exists"/></not>

           </condition>

@@ -60,6 +60,7 @@

     <exec executable="/bin/sh" failonerror="true">

       <arg value="${root}/bootstrap.sh"/>

+      <arg value="${hadoop.root}/build/c++/${build.platform}/lib"/>

     </exec>

     <exec executable="make" failonerror="true">

       <env key="OS_NAME" value="${os.name}"/>

--- src/contrib/fuse-dfs/src/Makefile.am.orig   2012-05-09 05:34:53.000000000 +0900

+++ src/contrib/fuse-dfs/src/Makefile.am    2012-09-08 16:33:28.000000000 +0900

@@ -16,5 +16,5 @@

 bin_PROGRAMS = fuse_dfs

 fuse_dfs_SOURCES = fuse_dfs.c fuse_options.c fuse_trash.c fuse_stat_struct.c fuse_users.c fuse_init.c fuse_connect.c fuse_impls_access.c fuse_impls_chmod.c  fuse_impls_chown.c  fuse_impls_create.c  fuse_impls_flush.c fuse_impls_getattr.c  fuse_impls_mkdir.c  fuse_impls_mknod.c  fuse_impls_open.c fuse_impls_read.c fuse_impls_release.c fuse_impls_readdir.c fuse_impls_rename.c fuse_impls_rmdir.c fuse_impls_statfs.c fuse_impls_symlink.c fuse_impls_truncate.c fuse_impls_utimens.c  fuse_impls_unlink.c fuse_impls_write.c

 AM_CPPFLAGS= -DPERMS=$(PERMS) -D_FILE_OFFSET_BITS=64 -I$(JAVA_HOME)/include -I$(HADOOP_HOME)/src/c++/libhdfs/ -I$(JAVA_HOME)/include/linux/ -D_FUSE_DFS_VERSION=\"$(PACKAGE_VERSION)\" -DPROTECTED_PATHS=\"$(PROTECTED_PATHS)\" -I$(FUSE_HOME)/include

-AM_LDFLAGS= -L$(HADOOP_HOME)/build/libhdfs -lhdfs -L$(FUSE_HOME)/lib -lfuse -L$(JAVA_HOME)/jre/lib/$(OS_ARCH)/server -ljvm

+AM_LDFLAGS=

--- src/contrib/fuse-dfs/acinclude.m4.orig  2012-05-09 05:34:52.000000000 +0900

+++ src/contrib/fuse-dfs/acinclude.m4   2012-09-14 15:09:41.000000000 +0900

@@ -89,14 +89,14 @@

      ENABLED_OPT="yes"

   ]

 )

-if test "$ENABLED_OPT" = "yes"

-then

-     CFLAGS="-Wall -O3"

-     CXXFLAGS="-Wall -O3"

-else

-     CFLAGS="-Wall -g"

-     CXXFLAGS="-Wall -g"

-fi

+#if test "$ENABLED_OPT" = "yes"

+#then

+#     CFLAGS="-Wall -O3"

+#     CXXFLAGS="-Wall -O3"

+#else

+#     CFLAGS="-Wall -g"

+#     CXXFLAGS="-Wall -g"

+#fi

 AC_MSG_RESULT($ENABLED_OPT)

 AM_CONDITIONAL([OPT], [test "$ENABLED_OPT" = yes])

 AM_CONDITIONAL([DEBUG], [test "$ENABLED_OPT" = no])

@@ -115,14 +115,14 @@

      ENABLED_DEBUG="yes"

   ]

 )

-if test "$ENABLED_DEBUG" = "yes"

-then

-     CFLAGS="-Wall -g"