Author: acmurthy
Date: Wed Jan 7 08:32:20 2009
New Revision: 732385
URL: http://svn.apache.org/viewvc?rev=732385&view=rev
Log:
HADOOP-4949. Fix native compilation. Contributed by Chris Douglas.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/build.xml
hadoop/core/trunk/src/native/Makefile.am
hadoop/core/trunk/src/native/Makefile.in
hadoop/core/trunk/src/native/aclocal.m4
hadoop/core/trunk/src/native/configure
hadoop/core/trunk/src/native/lib/Makefile.in
hadoop/core/trunk/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=732385&r1=732384&r2=732385&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Jan 7 08:32:20 2009
@@ -535,6 +535,8 @@
HADOOP-4979. Fix capacity scheduler to block cluster for failed high
RAM requirements across task types. (Vivek Ratan via yhemanth)
+ HADOOP-4949. Fix native compilation. (Chris Douglas via acmurthy)
+
Release 0.19.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=732385&r1=732384&r2=732385&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Wed Jan 7 08:32:20 2009
@@ -455,7 +455,6 @@
<mkdir dir="${build.native}/lib"/>
<mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/zlib"/>
- <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/lzo"/>
<javah
classpath="${build.classes}"
@@ -467,16 +466,6 @@
<class name="org.apache.hadoop.io.compress.zlib.ZlibDecompressor" />
</javah>
- <javah
- classpath="${build.classes}"
- destdir="${build.native}/src/org/apache/hadoop/io/compress/lzo"
- force="yes"
- verbose="yes"
- >
- <class name="org.apache.hadoop.io.compress.lzo.LzoCompressor" />
- <class name="org.apache.hadoop.io.compress.lzo.LzoDecompressor" />
- </javah>
-
<exec dir="${build.native}" executable="sh" failonerror="true">
<env key="OS_NAME" value="${os.name}"/>
<env key="OS_ARCH" value="${os.arch}"/>
Modified: hadoop/core/trunk/src/native/Makefile.am
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/native/Makefile.am?rev=732385&r1=732384&r2=732385&view=diff
==============================================================================
--- hadoop/core/trunk/src/native/Makefile.am (original)
+++ hadoop/core/trunk/src/native/Makefile.am Wed Jan 7 08:32:20 2009
@@ -36,7 +36,7 @@
export PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
# List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib lib
# The following export is needed to build libhadoop.so in the 'lib' directory
export SUBDIRS
Modified: hadoop/core/trunk/src/native/Makefile.in
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/native/Makefile.in?rev=732385&r1=732384&r2=732385&view=diff
==============================================================================
--- hadoop/core/trunk/src/native/Makefile.in (original)
+++ hadoop/core/trunk/src/native/Makefile.in Wed Jan 7 08:32:20 2009
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -67,6 +67,7 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -206,7 +207,7 @@
target_alias = @target_alias@
# List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib lib
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
