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

Remove some now unnecessary gcj workarounds

Browse Source
This commit is contained in:
gbenson 2005-03-29 11:13:22 +00:00
parent 3d33c30ba4
commit 5814912729
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ant.spec
View File

@ -20,7 +20,6 @@ Source2: apache-ant-%{version}.ant.conf
# Fix temp directory used for file containing large command strings (> 4k) # Fix temp directory used for file containing large command strings (> 4k)
Patch0: apache-ant-%{version}.patch Patch0: apache-ant-%{version}.patch
Patch1: apache-ant-%{version}-rpm.patch Patch1: apache-ant-%{version}-rpm.patch
Patch2: apache-ant-javac-ecj.patch
Requires: jaxp_parser_impl Requires: jaxp_parser_impl
Requires: jpackage-utils >= 0:1.5 Requires: jpackage-utils >= 0:1.5
# XXX make beehive play nice # XXX make beehive play nice
@ -311,12 +310,6 @@ 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
if java -version 2>&1 | grep -q "gcj"; then
%patch2 -p1
rm -f src/script/ant.orig
fi
# clean jar files # clean jar files
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
@ -332,10 +325,6 @@ export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis
[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf [ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java [ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
export JAVA_HOME export JAVA_HOME
if java -version 2>&1 | grep -q "gcj"; then
# make sure we do not use an installed native ant during the build
export ANT_OPTS="-Dgnu.gcj.runtime.VMClassLoader.library_control=never"
fi
sh build.sh --noconfig jars javadocs sh build.sh --noconfig jars javadocs
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -572,6 +561,7 @@ fi
%changelog %changelog
* Tue Mar 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_3fc * Tue Mar 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_3fc
- Add NOTICE file as per Apache License version 2.0. - Add NOTICE file as per Apache License version 2.0.
- Remove some now unnecessary gcj workarounds.
* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_2fc * Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_2fc
- Use jdtcore.jar instead of ecj.jar when running under libgcj. - Use jdtcore.jar instead of ecj.jar when running under libgcj.