rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust javah patch

Browse Source
This commit is contained in:
Fernando Nasser 2007-07-27 17:02:27 +00:00
parent b663f31a6e
commit 3e5b74acae
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ant.spec
View File

@ -606,7 +606,7 @@ Javadoc pour %{name}.
%setup -q -n apache-ant-%{cvs_version} %setup -q -n apache-ant-%{cvs_version}
# #157750: make the javah task work with java-gcj-compat # #157750: make the javah task work with java-gcj-compat
%patch2 -p1 %patch2 -p0
# Fix some places where copies of classes are included in the wrong jarfiles # Fix some places where copies of classes are included in the wrong jarfiles
%patch4 -p1 -b .orig %patch4 -p1 -b .orig

40
apache-ant-1.7.0-javah.patch
View File

@ -1,22 +1,22 @@
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.original 2005-10-31 15:05:55.000000000 -0500 --- src/main/org/apache/tools/ant/util/JavaEnvUtils.java.orig 2006-12-13 07:16:19.000000000 -0500
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2005-10-31 15:11:31.000000000 -0500 +++ src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2007-07-27 12:59:04.000000000 -0400
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
} }
kaffeDetected = false; kaffeDetected = false;
try { try {
- Class.forName("kaffe.util.NotImplemented"); - Class.forName("kaffe.util.NotImplemented");
+ Class.forName("gnu.classpath.Configuration"); + Class.forName("gnu.classpath.Configuration");
kaffeDetected = true; kaffeDetected = true;
} catch (Throwable t) { } catch (Throwable t) {
// swallow as this simply doesn't seem to be Kaffe // swallow as this simply doesn't seem to be Kaffe
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.original 2005-10-31 15:06:34.000000000 -0500 --- src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.orig 2006-12-13 07:16:22.000000000 -0500
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2005-10-31 15:08:13.000000000 -0500 +++ src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2007-07-27 13:00:51.000000000 -0400
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
private Commandline setupKaffehCommand(Javah javah) { private Commandline setupKaffehCommand(Javah javah) {
Commandline cmd = new Commandline(); Commandline cmd = new Commandline();
- cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh")); - cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh"));
+ cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah")); + cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah"));
if (javah.getDestdir() != null) { if (javah.getDestdir() != null) {
cmd.createArgument().setValue("-d"); cmd.createArgument().setValue("-d");