packages: java-sun/java-sun.spec - add tests bcond; rel 2

[glen]

Author: glen                         Date: Mon Jan 25 18:21:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add tests bcond; rel 2

---- Files affected:
packages/java-sun:
   java-sun.spec (1.234 -> 1.235) 

---- Diffs:

================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.234 packages/java-sun/java-sun.spec:1.235
--- packages/java-sun/java-sun.spec:1.234	Fri Jan 15 10:56:26 2010
+++ packages/java-sun/java-sun.spec	Mon Jan 25 19:21:48 2010
@@ -13,7 +13,9 @@
 #  - http://forums.sun.com/thread.jspa?threadID=5375681&tstart=2
 #  - http://www.ibm.com/developerworks/forums/thread.jspa?messageID=14252965
 #
-%define		_enable_debug_packages 0
+# Conditional build:
+%bcond_without	tests		# build without tests
+#
 #
 %define		_src_ver	6u18
 %define		_dir_ver	%(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
@@ -23,7 +25,7 @@
 Summary(pl.UTF-8):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.6.0.18
-Release:	1
+Release:	2
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
@@ -69,7 +71,6 @@
 %define		arch	amd64
 %endif
 
-
 # rpm doesn't like strange version definitions provided by Sun's libs
 %define		_noautoprov	'\\.\\./.*' '/export/.*'
 # these with SUNWprivate.* are found as required, but not provided
@@ -78,6 +79,9 @@
 # don't depend on other JRE/JDK installed on build host
 %define		_noautoreqdep	libjava.so libjvm.so
 
+# binary packages already stripped
+%define		_enable_debug_packages 0
+
 %description
 Java Development Kit for Linux.
 
@@ -333,6 +337,14 @@
 cp %{SOURCE2} Test.java
 
 %build
+%if %{with tests}
+# Make sure we have /proc mounted,
+# javac Test.java fails to get lock otherwise and runs forever:
+# Java HotSpot(TM) Client VM warning: Can't detect initial thread stack location - find_vma failed
+if [ ! -f /proc/cpuinfo ]; then
+	echo >&2 "WARNING: /proc not mounted -- compile test may fail"
+fi
+
 # $ORIGIN does not work on PLD builders. workaround.
 export LD_LIBRARY_PATH=$(pwd)/jre/lib/%{arch}/jli
 ./bin/javac Test.java
@@ -342,6 +354,7 @@
 	echo "Set %%define _classdataversion to $classver and rerun."
 	exit 1
 fi
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -912,6 +925,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.235  2010/01/25 18:21:48  glen
+- add tests bcond; rel 2
+
 Revision 1.234  2010/01/15 09:56:26  paszczus
 - updated to 1.6.0.18
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/java-sun.spec?r1=1.234&r2=1.235&f=u