SPECS: openjdk.spec - build hotspot first - BR and EA

[glen]

Author: glen                         Date: Wed Apr 11 11:05:53 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build hotspot first
- BR and EA

---- Files affected:
SPECS:
   openjdk.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/openjdk.spec
diff -u SPECS/openjdk.spec:1.4 SPECS/openjdk.spec:1.5
--- SPECS/openjdk.spec:1.4	Wed Apr 11 12:38:26 2007
+++ SPECS/openjdk.spec	Wed Apr 11 13:05:47 2007
@@ -18,11 +18,14 @@
 # Source2-md5:	1b501642684b7cfe8aff3fa60c5a2083
 Source3:	Test.java
 URL:		https://openjdk.dev.java.net/
+BuildRequires:	ant
 BuildRequires:	file
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
+BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.357
-BuildRequires:	jdk
 Provides:	java(ClassDataVersion) = %{_classdataversion}
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,10 +44,20 @@
 cp %{SOURCE3} Test.java
 
 %build
+# HotSpot
+%{__make} \
+	-C hotspot/make \
+	ALT_BOOTDIR=%{java_home} \
+%ifarch %{x8664}
+	ARCH_DATA_MODEL=64
+%endif
+
+# Compiler
 cd compiler
 %ant
 cd -
 
+# Test Class Data Version
 ./compiler/dist/bin/javac Test.java
 classver=$(file Test.class | grep -o 'compiled Java class data, version [0-9.]*' | awk '{print $NF}')
 if [ "$classver" != %{_classdataversion} ]; then
@@ -75,6 +88,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2007/04/11 11:05:47  glen
+- build hotspot first
+- BR and EA
+
 Revision 1.4  2007/04/11 10:38:26  glen
 - now requires jdk to build javac.jar
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openjdk.spec?r1=1.4&r2=1.5&f=u