rpms/java-1.4.2-gcj-compat/devel ecj.sh.in, NONE, 1.1 java-1.4.2-gcj-compat.spec, 1.80, 1.81
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jul 8 11:10:20 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20700
Modified Files:
java-1.4.2-gcj-compat.spec
Added Files:
ecj.sh.in
Log Message:
Replace the binary ecj with a script to try and work around #162748
--- NEW FILE ecj.sh.in ---
#!/bin/sh
CLASSPATH=@JAVADIR@/eclipse-ecj.jar${CLASSPATH:+:}$CLASSPATH \
java org.eclipse.jdt.internal.compiler.batch.Main "$@"
Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- java-1.4.2-gcj-compat.spec 8 Jul 2005 10:45:51 -0000 1.80
+++ java-1.4.2-gcj-compat.spec 8 Jul 2005 11:10:17 -0000 1.81
@@ -20,7 +20,7 @@
%define name java-%{javaver}-%{origin}-compat
%define version %{javaver}.%{buildver}
-%define release 40jpp_35rh
+%define release 40jpp_36rh
%define cname java-%{javaver}-%{origin}
#%define bcarchivever 127
@@ -44,6 +44,7 @@
Source0: java-gcj-compat-%{jgcver}.tar.gz
#Source1: bcprov-jdk14-%{bcarchivever}.tar.gz
Source2: eclipse-ecj-3.1.0_fc-2.jar
+Source3: ecj.sh.in
Patch1: bootstrap-temp.patch
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: jpackage-utils >= 0:1.5, sed
@@ -138,14 +139,10 @@
mkdir tmp
cp -a %{SOURCE2} tmp/eclipse-ecj.jar
# close your eyes...
-RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's:-O.:-O0:g'` \
RPM_BUILD_ROOT=tmp python aot-compile-rpm
mv tmp/eclipse-ecj.jar tmp%{_libdir}/gcj/%{name}/* .
# (you can open them again now)
-gcj $RPM_OPT_FLAGS \
- --main=org.eclipse.jdt.internal.compiler.batch.Main \
- -Wl,-R,%{_libdir}/gcj/%{name} \
- eclipse-ecj.jar.so -o ecj
+sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj
%endif
%install
@@ -446,6 +443,9 @@
%defattr(-,root,root)
%changelog
+* Fri Jul 8 2005 Gary Benson <gbenson at redhat.com> 0:1.4.2.0-40jpp_36rh
+- Replace the binary ecj with a script to try and work around #162748.
+
* Fri Jul 8 2005 Gary Benson <gbenson at redhat.com> 0:1.4.2.0-40jpp_35rh
- Don't optimise bootstrap-ecj at all to try and work around #162748.
More information about the fedora-cvs-commits
mailing list