SPECS: icedtea.spec - builds without bootstrap (bootstrap itself n...

[arekm]

Author: arekm                        Date: Tue Jun 26 21:51:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds without bootstrap (bootstrap itself not tested)

---- Files affected:
SPECS:
   icedtea.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/icedtea.spec
diff -u SPECS/icedtea.spec:1.1 SPECS/icedtea.spec:1.2
--- SPECS/icedtea.spec:1.1	Tue Jun 26 22:35:51 2007
+++ SPECS/icedtea.spec	Tue Jun 26 23:51:15 2007
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 # TODO:
 # - fix bash substitution
+%bcond_without	bootstrap
+#
 %define	snap	20070626
 Summary:	OpenJDK and GNU Classpath code
 Name:		icedtea
@@ -16,7 +18,10 @@
 BuildRequires:	bash
 BuildRequires:	cups-devel
 BuildRequires:	eclipse-ecj
+BuildRequires:	findutils
+BuildRequires:	jdk
 BuildRequires:	libgcj
+BuildRequires:	libstdc++-devel
 BuildRequires:	motif-devel
 BuildRequires:	unzip
 BuildRequires:	xalan-j
@@ -36,18 +41,22 @@
 %prep
 %setup -q -n %{name} -a1
 
+sed -i -e 's#-Werror##g' openjdk/hotspot/build/linux/makefiles/gcc.make openjdk/j2se/make/common/*.gmk
+
 %build
 %configure \
 	--with-ecj-jar=%{_javadir}/ecj.jar \
 	--with-libgcj-jar=%{_javadir}/libgcj.jar \
 	--with-xalan2-jar=%{_javadir}/xalan.jar \
-	--with-xalan2-serializer-jar=%{_javadir}/xalan.jar \
+	--with-xalan2-serializer-jar=%{_javadir}/serializer.jar \
 	--with-xerces2-jar=%{_javadir}/xerces.jar \
 	--with-openjdk-src-zip=%{SOURCE1} \
 	--with-openjdk-src=${PWD}/openjdk
 
 %{__make} -j1 \
-	SHELL=/bin/bash
+	%{?with_bootstrap:bootstrap} \
+	SHELL=/bin/bash \
+	BOOTDIR=%{java_home}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007/06/26 21:51:15  arekm
+- builds without bootstrap (bootstrap itself not tested)
+
 Revision 1.1  2007/06/26 20:35:51  arekm
 - just started
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/icedtea.spec?r1=1.1&r2=1.2&f=u