Author: acmurthy
Date: Wed Jan 7 08:28:47 2009
New Revision: 732384
URL: http://svn.apache.org/viewvc?rev=732384&view=rev
Log:
Revert HADOOP-4949.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/build.xml
hadoop/core/trunk/src/native/Makefile.am
hadoop/core/trunk/src/native/aclocal.m4
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=732384&r1=732383&r2=732384&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Wed Jan 7 08:28:47 2009
@@ -532,8 +532,6 @@
HADOOP-4956. Creates TaskStatus for failed tasks with an empty Counters
object instead of null. (ddas)
- HADOOP-4949. Fix native compilation. (Chris Douglas via rangadi)
-
HADOOP-4979. Fix capacity scheduler to block cluster for failed high
RAM requirements across task types. (Vivek Ratan via yhemanth)
Modified: hadoop/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=732384&r1=732383&r2=732384&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Wed Jan 7 08:28:47 2009
@@ -455,6 +455,7 @@
<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}"
@@ -466,6 +467,16 @@
<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=732384&r1=732383&r2=732384&view=diff
==============================================================================
--- hadoop/core/trunk/src/native/Makefile.am (original)
+++ hadoop/core/trunk/src/native/Makefile.am Wed Jan 7 08:28:47 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 lib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib
# The following export is needed to build libhadoop.so in the 'lib' directory
export SUBDIRS
