Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 46946 invoked from network); 20 Dec 2006 20:24:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Dec 2006 20:24:55 -0000 Received: (qmail 75168 invoked by uid 500); 20 Dec 2006 20:25:02 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 75154 invoked by uid 500); 20 Dec 2006 20:25:02 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 75145 invoked by uid 99); 20 Dec 2006 20:25:02 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Dec 2006 12:25:02 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Dec 2006 12:24:52 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id C3E511A981A; Wed, 20 Dec 2006 12:24:03 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r489190 - in /lucene/hadoop/trunk: CHANGES.txt src/native/lib/Makefile.am src/native/lib/Makefile.in Date: Wed, 20 Dec 2006 20:24:03 -0000 To: hadoop-commits@lucene.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061220202403.C3E511A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cutting Date: Wed Dec 20 12:24:03 2006 New Revision: 489190 URL: http://svn.apache.org/viewvc?view=rev&rev=489190 Log: HADOOP-841. Fix native library to build 32-bit version even when on a 64-bit host, if a 32-bit JVM is specified. Contributed by Arun. Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/native/lib/Makefile.am lucene/hadoop/trunk/src/native/lib/Makefile.in Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=489190&r1=489189&r2=489190 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Wed Dec 20 12:24:03 2006 @@ -146,6 +146,9 @@ hadoop.tmp.dir, rather than the system temporary directory. (Hairong Kuang via cutting) +41. HADOOP-841. Fix native library to build 32-bit version even when + on a 64-bit host, if a 32-bit JVM is used. (Arun C Murthy via cutting) + Release 0.9.2 - 2006-12-15 Modified: lucene/hadoop/trunk/src/native/lib/Makefile.am URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/native/lib/Makefile.am?view=diff&rev=489190&r1=489189&r2=489190 ============================================================================== --- lucene/hadoop/trunk/src/native/lib/Makefile.am (original) +++ lucene/hadoop/trunk/src/native/lib/Makefile.am Wed Dec 20 12:24:03 2006 @@ -32,7 +32,7 @@ # Add .lo files in $(SUBDIRS) to construct libhadoop.so HADOOP_OBJS = $(foreach path,$(addprefix ../,$(SUBDIRS)),$(wildcard $(path)/*.lo)) -AM_LDFLAGS = @JNI_LDFLAGS@ +AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL) lib_LTLIBRARIES = libhadoop.la libhadoop_la_SOURCES = Modified: lucene/hadoop/trunk/src/native/lib/Makefile.in URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/native/lib/Makefile.in?view=diff&rev=489190&r1=489189&r2=489190 ============================================================================== --- lucene/hadoop/trunk/src/native/lib/Makefile.in (original) +++ lucene/hadoop/trunk/src/native/lib/Makefile.in Wed Dec 20 12:24:03 2006 @@ -205,7 +205,7 @@ # Add .lo files in $(SUBDIRS) to construct libhadoop.so HADOOP_OBJS = $(foreach path,$(addprefix ../,$(SUBDIRS)),$(wildcard $(path)/*.lo)) -AM_LDFLAGS = @JNI_LDFLAGS@ +AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL) lib_LTLIBRARIES = libhadoop.la libhadoop_la_SOURCES = libhadoop_la_LDFLAGS = -version-info 1:0:0