From 7865b1025aa508a221029046bc5f4494b82ced4d Mon Sep 17 00:00:00 2001
From: Mark Hindess <mark.hindess@googlemail.com>
Date: Sun, 21 Oct 2007 19:05:33 +0000
Subject: [PATCH] [r586934] Add support for hy.local.zlib option (already in
 classlib) to federation build.  And modify debian package rules to use this
 mode.

---
 build.xml    | 7 +++++++
 debian/rules | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index e599a91d2..444b13aae 100644
--- a/build.xml
+++ b/build.xml
@@ -33,6 +33,7 @@
     <property name="hy.cfg" value="release" />
 
     <property name="hy.no.sig" value="false" />
+    <property name="hy.local.zlib" value="false" />
 
     <description>
         Apache Harmony subproject federation script
@@ -322,6 +323,7 @@
         <ant antfile="working_classlib/build.xml" target="rebuild" inheritAll="false" >
             <property name="hy.cfg" value="${hy.cfg}"/>
             <property name="hy.no.sig" value="${hy.no.sig}"/>
+            <property name="hy.local.zlib" value="${hy.local.zlib}"/>
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
@@ -332,6 +334,7 @@
         <ant target="fetch_classlib_libs">
             <property name="hy.cfg" value="${hy.cfg}"/>
             <property name="hy.no.sig" value="${hy.no.sig}"/>
+            <property name="hy.local.zlib" value="${hy.local.zlib}"/>
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
         </ant>
@@ -341,6 +344,7 @@
         <ant antfile="working_classlib/build.xml" target="fetch-depends" inheritall="false" >
             <property name="hy.cfg" value="${hy.cfg}"/>
             <property name="hy.no.sig" value="${hy.no.sig}"/>
+            <property name="hy.local.zlib" value="${hy.local.zlib}"/>
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
         </ant>
@@ -350,6 +354,7 @@
         <ant antfile="working_classlib/build.xml" target="clean" inheritAll="false" >
             <property name="hy.cfg" value="${hy.cfg}"/>
             <property name="hy.no.sig" value="${hy.no.sig}"/>
+            <property name="hy.local.zlib" value="${hy.local.zlib}"/>
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.version" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
@@ -404,6 +409,7 @@
             <arg line="-Ddeploy.canonical.flag=true"/>
             <arg line="-Dsvn.revision=${harmony.version}" />
             <arg line="-Dhy.no.sig=${hy.no.sig}"/>
+            <arg line="-Dhy.local.zlib=${hy.local.zlib}"/>
             <arg line="${custom.props}"/>
             <env key="BUILD_CFG" value="${hy.cfg}"/>
         </exec>
@@ -440,6 +446,7 @@
             <arg line="/c build.bat -Dexternal.dep.CLASSLIB.loc=${drlvm.classlib.offset}"/>
             <arg line="-Ddeploy.canonical.flag=true"/>
             <arg line="-Dhy.no.sig=${hy.no.sig}"/>
+            <arg line="-Dhy.local.zlib=${hy.local.zlib}"/>
             <arg line="${custom.props}"/>
             <env key="BUILD_CFG" value="${hy.cfg}"/>
             <env key="CXX" value="msvc"/>
diff --git a/debian/rules b/debian/rules
index b64ebe58b..99866750a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 
 	# Add here commands to compile the arch part of the package.
-	ant -Dauto.fetch=true
+	ant -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true
 	touch $@
 
 build-indep: build-indep-stamp
@@ -60,7 +60,7 @@ clean:
 	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
 
 	# Add here commands to clean up after the build process.
-	ant clean
+	ant -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true clean
 
 	dh_clean  --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/Makefile.orig --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/fdlibm.h.orig --exclude ./working_classlib/modules/luni/src/main/native/fdlibm_dist/s_lib_version.c.orig --exclude ./working_classlib/modules/archive/src/main/native/zlib_dist/Makefile.orig
 
-- 
2.11.4.GIT