packages (OPENJDK-1_6): openjdk/openjdk.spec - -jX does not work with openj...

[pawelz]

Author: pawelz                       Date: Wed Dec 30 14:25:26 2009 GMT
Module: packages                      Tag: OPENJDK-1_6
---- Log message:
- -jX does not work with openjdk Makefile. Use HOTSPOT_BUILD_JOBS instead.
- it %builds

---- Files affected:
packages/openjdk:
   openjdk.spec (1.8.2.2 -> 1.8.2.3) 

---- Diffs:

================================================================
Index: packages/openjdk/openjdk.spec
diff -u packages/openjdk/openjdk.spec:1.8.2.2 packages/openjdk/openjdk.spec:1.8.2.3
--- packages/openjdk/openjdk.spec:1.8.2.2	Wed Dec 30 14:33:14 2009
+++ packages/openjdk/openjdk.spec	Wed Dec 30 15:25:21 2009
@@ -4,6 +4,9 @@
 %define		_classdataversion	50.0
 %define		buildnum		b17
 
+# It does not work with openjdk Makefile. Use HOTSPOT_BUILD_JOBS instead.
+%undefine	_smp_mflags
+
 Summary:	Open-source JDK, an implementation of the Java Platform
 Summary(pl.UTF-8):	JDK o otwartych źrodłach - implementacja platformy Java
 Name:		openjdk
@@ -43,11 +46,12 @@
 unset CLASSPATH
 LC_ALL=C
 LANG=C
-export JAVA_HOME CLASSPATH LC_ALL LANG
+HOTSPOT_BUILD_JOBS=%(_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); [ "$_NCPUS" -gt 1 ] && echo "$(($_NCPUS * 2))")
+export JAVA_HOME CLASSPATH LC_ALL LANG HOTSPOT_BUILD_JOBS
 
-%{__make} sanity
-%{__make} \
-	UTILS_USR_BIN_PATH=""
+/usr/bin/make sanity
+/usr/bin/make \
+	UTILS_USR_BIN_PATH="" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	OPT_CFLAGS="%{rpmcflags}" \
@@ -60,7 +64,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} export_product \
+/usr/bin/make export_product \
 	ALT_BOOTDIR=%{java_home} \
 	EXPORT_PATH=$RPM_BUILD_ROOT%{_prefix} \
 	EXPORT_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \
@@ -94,6 +98,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8.2.3  2009/12/30 14:25:21  pawelz
+- -jX does not work with openjdk Makefile. Use HOTSPOT_BUILD_JOBS instead.
+- it %builds
+
 Revision 1.8.2.2  2009/12/30 13:33:14  pawelz
 - md5, NFY
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openjdk/openjdk.spec?r1=1.8.2.2&r2=1.8.2.3&f=u