packages: icedtea6/icedtea6.spec - without_bootstrap bcond, to build with i...

[jajcus]

Author: jajcus                       Date: Thu Apr 15 11:17:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- without_bootstrap bcond, to build with installed IcedTea

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.9 packages/icedtea6/icedtea6.spec:1.10
--- packages/icedtea6/icedtea6.spec:1.9	Thu Apr 15 12:36:07 2010
+++ packages/icedtea6/icedtea6.spec	Thu Apr 15 13:17:49 2010
@@ -1,5 +1,8 @@
 # $Revision$, $Date$
 #
+%bcond_without bootstrap	# don't use gcj, use an installed icedtea6
+				# instead
+#
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 50.0
 # JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
@@ -25,16 +28,17 @@
 # Source4-md5:	a2f7b972124cd776ff71e7754eb9a429
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
+%{!?with_bootstrap:BuildRequires:	ant}
 BuildRequires:	bash
 BuildRequires:	cups-devel
-# BuildRequires:	eclipse-ecj
 BuildRequires:	freetype-devel >= 2.3
-BuildRequires:	gcc-java >= 6:4.3
+%{?with_bootstrap:BuildRequires:	gcc-java >= 6:4.3}
 BuildRequires:	giflib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gtk+2-devel
-#BuildRequires:	gdk-pixbuf-devel
-BuildRequires:	java-gcj-compat-devel-base
+%{!?with_bootstrap:BuildRequires:	icedtea6-jdk-base}
+%{?with_bootstrap:BuildRequires:	java-gcj-compat-devel-base}
+BuildRequires:	libffi-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
@@ -232,12 +236,15 @@
 ln -s %{SOURCE4} drops
 
 %build
-unset JAVA_HOME || :
+JAVA_HOME=%{_jvmdir}/icedtea6
 %configure \
+%if %{with bootstrap}
 	--with-gcj-home=%{_gcj_home} \
-	--with-ecj=%{_bindir}/ecj \
-	--with-ecj-jar=%{_javadir}/ecj.jar \
 	--with-libgcj-jar=%{_javadir}/libgcj.jar \
+	--with-ecj-jar=%{_javadir}/ecj.jar \
+%else
+	--with-openjdk=%{_jvmdir}/icedtea6 \
+%endif
 	--with-xalan2-jar=%{_javadir}/xalan.jar \
 	--with-xalan2-serializer-jar=%{_javadir}/serializer.jar \
 	--with-rhino=%{_javadir}/js.jar \
@@ -245,8 +252,10 @@
 
 %{__make} extract extract-ecj
 
+%if %{with bootstrap}
 # Cannot do that as patch, as the sources are prepared by make
 %{__sed} -i -e's/CORBA_BUILD_ARGUMENTS = \\/CORBA_BUILD_ARGUMENTS = JVMLIB="" \\/' openjdk-ecj/make/corba-rules.gmk
+%endif
 
 %{__make} -j1 \
 	PRINTF=/bin/printf
@@ -622,6 +631,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/04/15 11:17:49  jajcus
+- without_bootstrap bcond, to build with installed IcedTea
+
 Revision 1.9  2010/04/15 10:36:07  jajcus
 - no mercurial BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.9&r2=1.10&f=u