SPECS: gcc.spec - restored lib-gnu-awt-xlib after my messing (it c...

[qboosh]

Author: qboosh                       Date: Sun Jan 14 12:11:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- restored lib-gnu-awt-xlib after my messing (it comes directly from libjava,
  not classpath as I though); added x bcond

---- Files affected:
SPECS:
   gcc.spec (1.457 -> 1.458) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.457 SPECS/gcc.spec:1.458
--- SPECS/gcc.spec:1.457	Sat Jan  6 12:49:18 2007
+++ SPECS/gcc.spec	Sun Jan 14 13:11:26 2007
@@ -6,9 +6,6 @@
 #	- gconf peer? (but libgcj needs split anyway)
 #	- files:
 #	   /usr/lib/gcc/i686-pld-linux/4.2.0/libgfortranbegin.la
-#	   /usr/lib/lib-gnu-awt-xlib.a
-#	   /usr/lib/lib-gnu-awt-xlib.la
-#	   /usr/lib/lib-gnu-awt-xlib.so.8.0.0
 #
 # Conditional build:
 %bcond_without	ada		# build without ADA support
@@ -21,6 +18,7 @@
 %bcond_without	dssi		# don't build libgcj DSSI MIDI interface
 %bcond_without	gtk		# don't build libgcj GTK peer
 %bcond_without	qt		# don't build libgcj Qt peer
+%bcond_without	x		# don't build libgcj Xlib-dependent AWTs (incl. GTK/Qt)
 %bcond_with	multilib	# build with multilib support (it needs glibc[32&64]-devel)
 %bcond_with	profiling	# build with profiling
 %bcond_without	bootstrap	# omit 3-stage bootstrap
@@ -39,6 +37,11 @@
 %undefine	with_profiling
 %endif
 
+%if !%{with x}
+%undefine	with_gtk
+%undefine	with_qt
+%endif
+
 %ifnarch %{x8664} ppc64 s390x sparc64
 %undefine	with_multilib
 %endif
@@ -891,9 +894,9 @@
 	%{!?with_alsa:--disable-alsa} \
 	%{!?with_dssi:--disable-dssi} \
 	--disable-gconf-peer \
+%if %{with x}
 	--enable-java-awt="xlib%{?with_gtk:,gtk}%{?with_qt:,qt}" \
-	%{!?with_gtk:--disable-gtk-peer} \
-	%{!?with_qt:--disable-qt-peer} \
+%endif
 	--enable-libgcj \
 	--enable-libgcj-multifile \
 	--enable-libgcj-database \
@@ -1004,8 +1007,13 @@
 	%{?with_fortran:libgfortran.la} \
 %if %{with java}
 	libgcj.la libgcj-tools.la libffi.la \
-	%{?with_gtk:gcj-%{version}/libgtkpeer.la gcj-%{version}/libjawt.la} gcj-%{version}/libjvm.la %{?with_qt:gcj-%{version}/libqtpeer.la} \
-	%{?with_alsa:gcj-%{version}/libgjsmalsa.la} %{?with_dssi:gcj-%{version}/libgjsmdssi.la} gcj-%{version}/libxmlj.la \
+	gcj-%{version}/libjvm.la \
+	gcj-%{version}/libxmlj.la \
+	%{?with_x:lib-gnu-awt-xlib.la} \
+	%{?with_gtk:gcj-%{version}/libgtkpeer.la gcj-%{version}/libjawt.la} \
+	%{?with_qt:gcj-%{version}/libqtpeer.la} \
+	%{?with_alsa:gcj-%{version}/libgjsmalsa.la} \
+	%{?with_dssi:gcj-%{version}/libgjsmdssi.la} \
 %endif
 	%{?with_objc:libobjc.la};
 do
@@ -1386,6 +1394,7 @@
 %attr(755,root,root) %{_libdir}/libgcj_bc.so
 %attr(755,root,root) %{_libdir}/libgcj_bc.so.*.*.*
 %attr(755,root,root) %{_libdir}/libgij.so.*.*.*
+%{?with_x:%attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so.*.*.*}
 %dir %{_libdir}/gcj-%{version}
 %{_libdir}/gcj-%{version}/classmap.db
 %{?with_alsa:%attr(755,root,root) %{_libdir}/gcj-%{version}/libgjsmalsa.so*}
@@ -1427,6 +1436,10 @@
 %attr(755,root,root) %{_libdir}/libgcj.so
 %{_libdir}/libgij.la
 %attr(755,root,root) %{_libdir}/libgij.so
+%if %{with x}
+%attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so
+%{_libdir}/lib-gnu-awt-xlib.la
+%endif
 %{_pkgconfigdir}/libgcj-%{_major_ver}.pc
 
 %files -n libgcj-static
@@ -1436,6 +1449,7 @@
 %{_libdir}/libgcj.a
 %{_libdir}/libgcj_bc.a
 %{_libdir}/libgij.a
+%{?with_x:%{_libdir}/lib-gnu-awt-xlib.a}
 
 %files -n libffi
 %defattr(644,root,root,755)
@@ -1506,6 +1520,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.458  2007/01/14 12:11:26  qboosh
+- restored lib-gnu-awt-xlib after my messing (it comes directly from libjava,
+  not classpath as I though); added x bcond
+
 Revision 1.457  2007/01/06 11:49:18  pluto
 - update
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.457&r2=1.458&f=u