Author: rangadi
Date: Fri Jan 2 09:34:02 2009
New Revision: 730794
URL: http://svn.apache.org/viewvc?rev=730794&view=rev
Log:
HADOOP-4949. Fix native compilation. (Chris Douglas via rangadi)
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=730794&r1=730793&r2=730794&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Jan 2 09:34:02 2009
@@ -525,6 +525,8 @@
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)
+
Release 0.19.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=730794&r1=730793&r2=730794&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Fri Jan 2 09:34:02 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=730794&r1=730793&r2=730794&view=diff
==============================================================================
--- hadoop/core/trunk/src/native/Makefile.am (original)
+++ hadoop/core/trunk/src/native/Makefile.am Fri Jan 2 09:34:02 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
