rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.23, 1.24 java-1.4.2-gcj-compat.spec, 1.72, 1.73 sources, 1.26, 1.27

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27487

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
Bootstrap onto ppc64, s390 and s390x


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	7 Jul 2005 10:55:14 -0000	1.23
+++ .cvsignore	7 Jul 2005 15:38:04 -0000	1.24
@@ -1,2 +1,3 @@
 java-gcj-compat-1.0.31.tar.gz
 bcprov-jdk14-127.tar.gz
+eclipse-ecj-3.1.0_fc-2.jar


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.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- java-1.4.2-gcj-compat.spec	7 Jul 2005 10:55:14 -0000	1.72
+++ java-1.4.2-gcj-compat.spec	7 Jul 2005 15:38:04 -0000	1.73
@@ -1,5 +1,11 @@
 %define section		free
 
+%ifarch %{ix86} x86_64 ppc
+%define bootstrap	0
+%else
+%define bootstrap	1
+%endif
+
 %{!?custom:	%define custom 0}
 %{!?gcjprefix: 	%define gcjprefix %{nil}}
 %{!?origin:	%{expand: %%define origin gcj%{gccsuffix}}}
@@ -14,7 +20,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release		40jpp_32rh
+%define release		40jpp_33rh
 %define cname           java-%{javaver}-%{origin}
 #%define bcarchivever	127
 
@@ -37,6 +43,7 @@
 URL:		ftp://sources.redhat.com/pub/rhug/java-gcj-compat
 Source0:        java-gcj-compat-%{jgcver}.tar.gz
 #Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
+Source2:	eclipse-ecj-3.1.0_fc-2.jar
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
@@ -59,7 +66,6 @@
 Provides:	jaxp_parser_impl
 Provides:	jndi, jdbc-stdext, jaas, jsse, jta
 Obsoletes:	java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh
-ExclusiveArch: %{ix86} x86_64 ppc
 
 %description
 This package installs directory structures, shell scripts and symbolic
@@ -77,7 +83,9 @@
 Provides:	java-devel-%{origin} = %{epoch}:%{version}
 Provides:       java-devel = %{javaver}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+%if !%{bootstrap}
 Requires:	eclipse-ecj
+%endif
 Requires:	gcc%{gccsuffix}-java >= %{gccver}
 Obsoletes:	java-1.4.2-gcj4-compat-devel <= 1.4.2.0-4jpp_2rh
 
@@ -123,6 +131,20 @@
 #   test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
 # popd
 
+%if %{bootstrap}
+cp -a %{SOURCE2} eclipse-ecj.jar
+gcj -shared $RPM_OPT_FLAGS -fPIC \
+    -findirect-dispatch -Wl,-Bsymbolic \
+    eclipse-ecj.jar -o eclipse-ecj.jar.so
+gcj-dbtool -n eclipse-ecj.jar.db 64
+gcj-dbtool -f eclipse-ecj.jar.db \
+    eclipse-ecj.jar %{_libdir}/gcj/%{name}/eclipse-ecj.jar.so
+gcj $RPM_OPT_FLAGS \
+    --main=org.eclipse.jdt.internal.compiler.batch.Main \
+    -Wl,-R,%{_libdir}/gcj/%{name} \
+    eclipse-ecj.jar.so -o ecj
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -185,6 +207,16 @@
 # classmap database directory
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/gcj
 
+%if %{bootstrap}
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+install -m644 eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
+install -m755 eclipse-ecj.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
+install -m644 eclipse-ecj.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m755 ecj $RPM_BUILD_ROOT%{_bindir}
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -401,11 +433,19 @@
 %{_jvmdir}/%{sdkdir}/include
 %{_jvmdir}/%{sdklnk}
 %{_jvmjardir}/%{sdklnk}
+%if %{bootstrap}
+%{_bindir}/ecj
+%{_libdir}/gcj/%{name}
+%{_javadir}/eclipse-ecj.jar
+%endif
 
 %files src
 %defattr(-,root,root)
 
 %changelog
+* Thu Jul  7 2005 Gary Benson <gbenson redhat com>  0:1.4.2.0-40jpp_33rh
+- Bootstrap onto ppc64, s390 and s390x.
+
 * Thu Jul  7 2005 Gary Benson <gbenson redhat com>  0:1.4.2.0-40jpp_32rh
 - Import java-gcj-compat 1.0.31.
 - Move the aot-compile scripts to the devel subpackage.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	7 Jul 2005 10:55:14 -0000	1.26
+++ sources	7 Jul 2005 15:38:04 -0000	1.27
@@ -1,2 +1,3 @@
 1d64d0db2e06e56ef6cdff2ea942ca59  java-gcj-compat-1.0.31.tar.gz
 d17b7fa532fc87fdf14d42c2d293ec3f  bcprov-jdk14-127.tar.gz
+45cac8feb5fb2cabbde9c7bc73d658f9  eclipse-ecj-3.1.0_fc-2.jar