Author: suresh
Date: Tue Jul 24 21:52:31 2012
New Revision: 1365315
URL: http://svn.apache.org/viewvc?rev=1365315&view=rev
Log:
HADOOP-8618. Fix build failures due to release 1.0.3 merge. Contributed by
Bikas Saha
Modified:
hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
hadoop/common/branches/branch-1-win/build.xml
Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1365315&r1=1365314&r2=1365315&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Tue Jul 24
21:52:31 2012
@@ -67,3 +67,5 @@ BUG FIXES
HDFS-6527. Backport HADOOP-7389: Use of TestingGroups by tests causes
subsequent tests to fail. (Ivan Mitic via szetszwo)
+ HADOOP-8618. Fix build failures due to release 1.0.3 merge.
+ (Bikas Saha via suresh)
Modified: hadoop/common/branches/branch-1-win/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/build.xml?rev=1365315&r1=1365314&r2=1365315&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/build.xml (original)
+++ hadoop/common/branches/branch-1-win/build.xml Tue Jul 24 21:52:31 2012
@@ -639,9 +639,9 @@
</exec>
</target>
- <target name="compile-core-native" depends="create-native-configure,
compile-core-classes"
- if="compile.native">
-
+ <target name="compile-core-native" if="compile.native">
+ <antcall target="compile-core-classes"/>
+ <antcall target="create-native-configure"/>
<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/snappy"/>