Author: eli
Date: Fri May 27 21:46:12 2011
New Revision: 1128473
URL: http://svn.apache.org/viewvc?rev=1128473&view=rev
Log:
HDFS-1920. libhdfs does not build for ARM processors. Contributed by Trevor Robinson
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/c++/libhdfs/configure.ac
hadoop/hdfs/trunk/src/c++/libhdfs/m4/apsupport.m4
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1128473&r1=1128472&r2=1128473&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri May 27 21:46:12 2011
@@ -635,6 +635,9 @@ Trunk (unreleased changes)
HDFS-1592. Datanode startup doesn't honor volumes.tolerated.
(Bharath Mundlapudi via jitendra)
+ HDFS-1920. libhdfs does not build for ARM processors.
+ (Trevor Robinson via eli)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hdfs/trunk/src/c++/libhdfs/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/c%2B%2B/libhdfs/configure.ac?rev=1128473&r1=1128472&r2=1128473&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/c++/libhdfs/configure.ac (original)
+++ hadoop/hdfs/trunk/src/c++/libhdfs/configure.ac Fri May 27 21:46:12 2011
@@ -82,9 +82,16 @@ AP_PROG_JAR()
AP_JVM_LIBDIR()
if test "$supported_os" != "darwin"
then
- CFLAGS="$CFLAGS -m${JVM_ARCH} -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
- LDFLAGS="$LDFLAGS -m${JVM_ARCH} -L$LIB_JVM_DIR -ljvm -Wl,-x"
+ case $host_cpu in
+ arm*) ;;
+ *)
+ CFLAGS="$CFLAGS -m${JVM_ARCH}"
+ LDFLAGS="$LDFLAGS -m${JVM_ARCH}"
+ ;;
+ esac
AC_MSG_RESULT([VALUE OF JVM_ARCH IS :$JVM_ARCH])
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
+ LDFLAGS="$LDFLAGS -L$LIB_JVM_DIR -ljvm -Wl,-x"
fi
dnl -------------------------------------------------------------------------
Modified: hadoop/hdfs/trunk/src/c++/libhdfs/m4/apsupport.m4
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/c%2B%2B/libhdfs/m4/apsupport.m4?rev=1128473&r1=1128472&r2=1128473&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/c++/libhdfs/m4/apsupport.m4 (original)
+++ hadoop/hdfs/trunk/src/c++/libhdfs/m4/apsupport.m4 Fri May 27 21:46:12 2011
@@ -118,6 +118,10 @@ AC_DEFUN([AP_SUPPORTED_HOST],[
CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
supported_os="s390"
HOST_CPU=s390;;
+ arm*)
+ CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
+ supported_os="arm"
+ HOST_CPU=arm;;
*)
AC_MSG_RESULT([failed])
AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
|