big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-7276. Hadoop native builds fail on ARM due to -m32. Contributed by Trevor Robinson

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1128475 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2011-05-27 21:46:37 +00:00
parent 6891b254f4
commit 5ec9e9e0a2
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -740,6 +740,9 @@ Release 0.22.0 - Unreleased
HADOOP-7146. RPC server leaks file descriptors (todd) HADOOP-7146. RPC server leaks file descriptors (todd)
HADOOP-7276. Hadoop native builds fail on ARM due to -m32 (Trevor Robinson
via eli)
Release 0.21.1 - Unreleased Release 0.21.1 - Unreleased
IMPROVEMENTS IMPROVEMENTS

8
src/native/Makefile.am
View File

@ -36,8 +36,12 @@ AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \
-Isrc/org/apache/hadoop/io/compress/zlib \ -Isrc/org/apache/hadoop/io/compress/zlib \
-Isrc/org/apache/hadoop/security \ -Isrc/org/apache/hadoop/security \
-Isrc/org/apache/hadoop/io/nativeio/ -Isrc/org/apache/hadoop/io/nativeio/
AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL) AM_LDFLAGS = @JNI_LDFLAGS@
AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL) AM_CFLAGS = -g -Wall -fPIC -O2
if SPECIFY_DATA_MODEL
AM_LDFLAGS += -m$(JVM_DATA_MODEL)
AM_CFLAGS += -m$(JVM_DATA_MODEL)
endif
lib_LTLIBRARIES = libhadoop.la lib_LTLIBRARIES = libhadoop.la
libhadoop_la_SOURCES = src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c \ libhadoop_la_SOURCES = src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c \

2
src/native/configure.ac
View File

@ -100,6 +100,8 @@ AC_CHECK_FUNCS([memset])
# Check for nonstandard STRERROR_R # Check for nonstandard STRERROR_R
AC_FUNC_STRERROR_R AC_FUNC_STRERROR_R
AM_CONDITIONAL([SPECIFY_DATA_MODEL], [case $host_cpu in arm*) false;; *) true;; esac])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT

5
src/native/lib/Makefile.am
View File

@ -32,7 +32,10 @@
# Add .lo files in $(SUBDIRS) to construct libhadoop.so # Add .lo files in $(SUBDIRS) to construct libhadoop.so
HADOOP_OBJS = $(foreach path,$(addprefix ../,$(SUBDIRS)),$(wildcard $(path)/*.lo)) HADOOP_OBJS = $(foreach path,$(addprefix ../,$(SUBDIRS)),$(wildcard $(path)/*.lo))
AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL) AM_LDFLAGS = @JNI_LDFLAGS@
if SPECIFY_DATA_MODEL
AM_LDFLAGS += -m$(JVM_DATA_MODEL)
endif
lib_LTLIBRARIES = libhadoop.la lib_LTLIBRARIES = libhadoop.la
libhadoop_la_SOURCES = libhadoop_la_SOURCES =

5
src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am
View File

@ -39,7 +39,10 @@ vpath %.c $(HADOOP_NATIVE_SRCDIR)/$(subdir)
AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src
AM_LDFLAGS = @JNI_LDFLAGS@ AM_LDFLAGS = @JNI_LDFLAGS@
AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL) AM_CFLAGS = -g -Wall -fPIC -O2
if SPECIFY_DATA_MODEL
AM_CFLAGS += -m$(JVM_DATA_MODEL)
endif
noinst_LTLIBRARIES = libnativezlib.la noinst_LTLIBRARIES = libnativezlib.la
libnativezlib_la_SOURCES = ZlibCompressor.c ZlibDecompressor.c libnativezlib_la_SOURCES = ZlibCompressor.c ZlibDecompressor.c