SPECS: openjdk.spec - built something on carme

[glen]

Author: glen                         Date: Tue Apr 17 23:02:35 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- built something on carme

---- Files affected:
SPECS:
   openjdk.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/openjdk.spec
diff -u SPECS/openjdk.spec:1.7 SPECS/openjdk.spec:1.8
--- SPECS/openjdk.spec:1.7	Tue Apr 17 23:05:24 2007
+++ SPECS/openjdk.spec	Wed Apr 18 01:02:30 2007
@@ -1,8 +1,10 @@
 # $Revision$, $Date$
 # TODO
-# - force our optflags for hotspot? (currently: -fno-rtti -fno-exceptions -fcheck-new -m32 -march=i586 -pipe -O3 -fno-strict-aliasing)
 # - all
 
+# broken
+%define	_enable_debug_packages 0
+
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 50.0
 Summary:	Open-source JDK, an implementation of the Java Platform
@@ -58,6 +60,10 @@
 
 %{__make} \
 	-j1 HOTSPOT_BUILD_JOBS=$HOTSPOT_BUILD_JOBS \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
+	OPT_CFLAGS="%{rpmcflags}" \
+	WARNINGS_ARE_ERRORS='' \
 	-C hotspot/make \
 	ALT_BOOTDIR=%{java_home} \
 %ifarch %{x8664}
@@ -79,6 +85,20 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%{__make} export_product \
+	-C hotspot/make \
+	ALT_BOOTDIR=%{java_home} \
+	EXPORT_PATH=$RPM_BUILD_ROOT%{_prefix} \
+	EXPORT_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \
+	EXPORT_JRE_LIB_ARCH_DIR=$RPM_BUILD_ROOT%{_libdir}/jre \
+	EXPORT_DOCS_DIR=$RPM_BUILD_ROOT%{_docdir} \
+%ifarch %{x8664}
+	ARCH_DATA_MODEL=64
+%endif
+
+rm -rf jvmti
+mv $RPM_BUILD_ROOT%{_docdir}/platform/jvmti .
+
 install -d $RPM_BUILD_ROOT{%{_javadir},%{_bindir}}
 cp -a compiler/dist/lib/javac.jar $RPM_BUILD_ROOT%{_javadir}/javac-%{version}.jar
 ln -s javac-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/javac.jar
@@ -89,7 +109,22 @@
 
 %files
 %defattr(644,root,root,755)
-%doc compiler/doc/*
+%doc compiler/doc/* jvmti
+
+# hotspot
+%dir %{_libdir}/jre
+%attr(755,root,root) %{_libdir}/jre/libsaproc.so
+%dir %{_libdir}/jre/server
+%{_libdir}/jre/server/Xusage.txt
+%attr(755,root,root) %{_libdir}/jre/server/libjsig.so
+%attr(755,root,root) %{_libdir}/jre/server/libjvm.so
+%{_libdir}/sa-jdi.jar
+%{_includedir}/jmm.h
+%{_includedir}/jni.h
+%{_includedir}/jvmti.h
+%{_includedir}/linux/jni_md.h
+
+# compiler
 %attr(755,root,root) %{_bindir}/javac
 %{_javadir}/javac-%{version}.jar
 %{_javadir}/javac.jar
@@ -100,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/04/17 23:02:30  glen
+- built something on carme
+
 Revision 1.7  2007/04/17 21:05:24  glen
 - new snapshot (build still fails on ac)
 
================================================================

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