Make the javah task fall back to executing javah
This commit is contained in:
parent
1b2344d3b0
commit
9cdb1f5eaa
10
ant.spec
10
ant.spec
@ -329,14 +329,14 @@ Javadoc pour %{name}.
|
|||||||
# Build OPT_JAR_LIST from the contents of /etc/ant.d/
|
# Build OPT_JAR_LIST from the contents of /etc/ant.d/
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
# fix classpath for java-x.y.z-gcj-compat
|
# fix classpath for java-gcj-compat
|
||||||
if java -version 2>&1 | grep -q "gcj"; then
|
if java -version 2>&1 | grep -q "gcj"; then
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
rm -f src/script/ant.orig
|
rm -f src/script/ant.orig
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# build the javah task (#157750)
|
# build the javah task (#157750) and make it work with java-gcj-compat
|
||||||
%patch3 -p1
|
%patch3 -p1 -b .orig
|
||||||
|
|
||||||
# clean jar files
|
# clean jar files
|
||||||
find . -name "*.jar" -exec rm -f {} \;
|
find . -name "*.jar" -exec rm -f {} \;
|
||||||
@ -627,6 +627,10 @@ fi
|
|||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 6 2005 Gary Benson <gbenson at redhat.com>
|
||||||
|
- Make the javah task fall back to executing javah if
|
||||||
|
com.sun.tools.javah.Main cannot be found.
|
||||||
|
|
||||||
* Tue May 25 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_9fc
|
* Tue May 25 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_9fc
|
||||||
- Rearrange how BC-compiled stuff is built and installed.
|
- Rearrange how BC-compiled stuff is built and installed.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user