Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 49E254EB9 for ; Fri, 27 May 2011 21:47:02 +0000 (UTC) Received: (qmail 95232 invoked by uid 500); 27 May 2011 21:47:02 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 95207 invoked by uid 500); 27 May 2011 21:47:02 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 95200 invoked by uid 99); 27 May 2011 21:47:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 21:47:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 21:46:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E94F2388A93; Fri, 27 May 2011 21:46:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1128475 - in /hadoop/common/trunk: CHANGES.txt src/native/Makefile.am src/native/configure.ac src/native/lib/Makefile.am src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am Date: Fri, 27 May 2011 21:46:37 -0000 To: common-commits@hadoop.apache.org From: eli@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110527214638.0E94F2388A93@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eli Date: Fri May 27 21:46:37 2011 New Revision: 1128475 URL: http://svn.apache.org/viewvc?rev=1128475&view=rev Log: HADOOP-7276. Hadoop native builds fail on ARM due to -m32. Contributed by Trevor Robinson Modified: hadoop/common/trunk/CHANGES.txt hadoop/common/trunk/src/native/Makefile.am hadoop/common/trunk/src/native/configure.ac hadoop/common/trunk/src/native/lib/Makefile.am hadoop/common/trunk/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am Modified: hadoop/common/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1128475&r1=1128474&r2=1128475&view=diff ============================================================================== --- hadoop/common/trunk/CHANGES.txt (original) +++ hadoop/common/trunk/CHANGES.txt Fri May 27 21:46:37 2011 @@ -740,6 +740,9 @@ Release 0.22.0 - Unreleased 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 IMPROVEMENTS Modified: hadoop/common/trunk/src/native/Makefile.am URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/native/Makefile.am?rev=1128475&r1=1128474&r2=1128475&view=diff ============================================================================== --- hadoop/common/trunk/src/native/Makefile.am (original) +++ hadoop/common/trunk/src/native/Makefile.am Fri May 27 21:46:37 2011 @@ -36,8 +36,12 @@ AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_ -Isrc/org/apache/hadoop/io/compress/zlib \ -Isrc/org/apache/hadoop/security \ -Isrc/org/apache/hadoop/io/nativeio/ -AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL) -AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL) +AM_LDFLAGS = @JNI_LDFLAGS@ +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 libhadoop_la_SOURCES = src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c \ Modified: hadoop/common/trunk/src/native/configure.ac URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/native/configure.ac?rev=1128475&r1=1128474&r2=1128475&view=diff ============================================================================== --- hadoop/common/trunk/src/native/configure.ac (original) +++ hadoop/common/trunk/src/native/configure.ac Fri May 27 21:46:37 2011 @@ -100,6 +100,8 @@ AC_CHECK_FUNCS([memset]) # Check for nonstandard STRERROR_R AC_FUNC_STRERROR_R +AM_CONDITIONAL([SPECIFY_DATA_MODEL], [case $host_cpu in arm*) false;; *) true;; esac]) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT Modified: hadoop/common/trunk/src/native/lib/Makefile.am URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/native/lib/Makefile.am?rev=1128475&r1=1128474&r2=1128475&view=diff ============================================================================== --- hadoop/common/trunk/src/native/lib/Makefile.am (original) +++ hadoop/common/trunk/src/native/lib/Makefile.am Fri May 27 21:46:37 2011 @@ -32,7 +32,10 @@ # Add .lo files in $(SUBDIRS) to construct libhadoop.so 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 libhadoop_la_SOURCES = Modified: hadoop/common/trunk/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am?rev=1128475&r1=1128474&r2=1128475&view=diff ============================================================================== --- hadoop/common/trunk/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am (original) +++ hadoop/common/trunk/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am Fri May 27 21:46:37 2011 @@ -39,7 +39,10 @@ vpath %.c $(HADOOP_NATIVE_SRCDIR)/$(subd AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src 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 libnativezlib_la_SOURCES = ZlibCompressor.c ZlibDecompressor.c