[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ant/devel apache-ant-bz163249.patch, NONE, 1.1.2.1 ant.spec, 1.52.2.9, 1.52.2.10



Author: gbenson

Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1081

Modified Files:
      Tag: ant-bootstrap2-branch
	ant.spec 
Added Files:
      Tag: ant-bootstrap2-branch
	apache-ant-bz163249.patch 
Log Message:
This gets us past bootstrapping, but it still won't build

apache-ant-bz163249.patch:
 Javac.java |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE apache-ant-bz163249.patch ---
Something is broken in the stacktrace department on ia64, and that's
stopping in-process ecj from working.  It'll probably break allsorts,
but this patch might at least allow us to get some stuff built in the
meantime.

--- apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/Javac.java~	2004-07-16 08:57:34.000000000 +0100
+++ apache-ant-1.6.2/src/main/org/apache/tools/ant/taskdefs/Javac.java	2005-07-14 15:49:07.000000000 +0100
@@ -86,6 +86,11 @@
     private boolean includeAntRuntime = true;
     private boolean includeJavaRuntime = false;
     private boolean fork = false;
+    {
+	// XXX this is an awful hack
+	if (System.getProperty("java.vm.name").equals("GNU libgcj"))
+	    fork = true;
+    }
     private String forkedExecutable = null;
     private boolean nowarn = false;
     private String memoryInitialSize;


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.52.2.9
retrieving revision 1.52.2.10
diff -u -r1.52.2.9 -r1.52.2.10
--- ant.spec	14 Jul 2005 13:09:47 -0000	1.52.2.9
+++ ant.spec	14 Jul 2005 15:14:18 -0000	1.52.2.10
@@ -20,6 +20,7 @@
 Patch0:         apache-ant-%{version}.patch
 Patch1:         apache-ant-%{version}-rpm.patch
 Patch3:         apache-ant-bz157750.patch
+Patch4:         apache-ant-bz163249.patch
 Requires:       jaxp_parser_impl
 Requires:       jpackage-utils >= 0:1.5
 Requires:       java-devel
@@ -355,6 +356,11 @@
 # build the javah task (#157750) and make it work with java-gcj-compat
 %patch3 -p1 -b .orig
 
+# work around some stacktrace breakage on ia64 (#163249)
+%ifarch ia64
+%patch4 -p1 -b .orig
+%endif
+
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]