Author: acmurthy
Date: Wed Jan 7 08:35:50 2009
New Revision: 732389
URL: http://svn.apache.org/viewvc?rev=732389&view=rev
Log:
Merge -r 732384:732385 from trunk to branch-0.20 to fix HADOOP-4949.
Modified:
hadoop/core/branches/branch-0.20/ (props changed)
hadoop/core/branches/branch-0.20/CHANGES.txt (contents, props changed)
hadoop/core/branches/branch-0.20/build.xml
hadoop/core/branches/branch-0.20/src/native/Makefile.am
hadoop/core/branches/branch-0.20/src/native/Makefile.in
hadoop/core/branches/branch-0.20/src/native/aclocal.m4
hadoop/core/branches/branch-0.20/src/native/configure
hadoop/core/branches/branch-0.20/src/native/lib/Makefile.in
hadoop/core/branches/branch-0.20/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in
Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 08:35:50 2009
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=732389&r1=732388&r2=732389&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Wed Jan 7 08:35:50 2009
@@ -506,6 +506,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
Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 08:35:50 2009
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385
Modified: hadoop/core/branches/branch-0.20/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/build.xml?rev=732389&r1=732388&r2=732389&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/build.xml (original)
+++ hadoop/core/branches/branch-0.20/build.xml Wed Jan 7 08:35:50 2009
@@ -456,7 +456,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}"
@@ -468,16 +467,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/branches/branch-0.20/src/native/Makefile.am
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/native/Makefile.am?rev=732389&r1=732388&r2=732389&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/native/Makefile.am (original)
+++ hadoop/core/branches/branch-0.20/src/native/Makefile.am Wed Jan 7 08:35:50
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/branches/branch-0.20/src/native/Makefile.in
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/native/Makefile.in?rev=732389&r1=732388&r2=732389&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/native/Makefile.in (original)
+++ hadoop/core/branches/branch-0.20/src/native/Makefile.in Wed Jan 7 08:35:50
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
