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
