Author: qboosh Date: Mon Dec 12 00:07:26 2005 GMT
Module: SPECS Tag: GCC_4_1
---- Log message:
- updated info patch
- try to build libgcjawt (but I can't test it, make consumes >450MB RAM)
---- Files affected:
SPECS:
gcc.spec (1.396.2.7 -> 1.396.2.8)
---- Diffs:
================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.396.2.7 SPECS/gcc.spec:1.396.2.8
--- SPECS/gcc.spec:1.396.2.7 Fri Dec 9 04:59:26 2005
+++ SPECS/gcc.spec Mon Dec 12 01:07:20 2005
@@ -41,7 +41,7 @@
Name: gcc
Version: 4.1.0
%define _snap 20051206r108118
-Release: 0.%{_snap}.2
+Release: 0.%{_snap}.2.1
Epoch: 5
License: GPL v2+
Group: Development/Languages
@@ -76,14 +76,11 @@
Patch21: %{name}-pr25248.patch
Patch22: %{name}-pr13676.patch
URL: http://gcc.gnu.org/
-%{?with_java:BuildRequires: alsa-lib-devel}
BuildRequires: autoconf
%{?with_tests:BuildRequires: autogen}
BuildRequires: automake
BuildRequires: binutils >= 2:2.15.94.0.1
BuildRequires: bison
-%{?with_java:BuildRequires: cairo-devel >= 0.5.0}
-%{?with_java:BuildRequires: dssi}
%{?with_tests:BuildRequires: dejagnu}
BuildRequires: fileutils >= 4.0.41
BuildRequires: flex
@@ -109,17 +106,25 @@
%else
BuildRequires: glibc-devel >= 2.2.5-20
%endif
-%if %{with fortran}
-BuildRequires: gmp-devel
-BuildRequires: libmpfr-devel
-%endif
-%{?with_java:BuildRequires: libxslt-devel}
-%{?with_java:BuildRequires: pango-devel}
BuildRequires: perl-devel
-%{?with_java:BuildRequires: pkgconfig}
BuildRequires: rpmbuild(macros) >= 1.211
BuildRequires: texinfo >= 4.1
BuildRequires: zlib-devel
+%if %{with fortran}
+BuildRequires: gmp-devel
+BuildRequires: libmpfr-devel
+%endif
+%if %{with java}
+BuildRequires: alsa-lib-devel
+BuildRequires: cairo-devel >= 0.5.0
+BuildRequires: dssi
+BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: libart_lgpl-devel >= 2.1
+BuildRequires: libxslt-devel
+BuildRequires: pango-devel
+BuildRequires: pkgconfig
+#BR: X-lib-libXtst-devel
+%endif
# AS_NEEDED directive for dynamic linker
# http://sources.redhat.com/ml/glibc-cvs/2005-q1/msg00614.html
# http://sources.redhat.com/ml/binutils/2005-01/msg00288.html
@@ -803,6 +808,7 @@
--libexecdir=%{_libdir} \
--infodir=%{_infodir} \
--mandir=%{_mandir} \
+ --x-libraries=/usr/X11R6/%{_lib} \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -817,14 +823,14 @@
--with-demangler-in-ld \
--with-system-zlib \
--with-slibdir=%{_slibdir} \
- --without-x \
+ %{!?with_java:--without-x} \
%{?with_fortran:--enable-cmath} \
%if %{with java}
--enable-libgcj \
--enable-libgcj-multifile \
--enable-libgcj-database \
- --enable-gtk-peer \
--enable-gtk-cairo \
+ --enable-java-awt=gtk,xlib \
--enable-jni \
--enable-xmlj \
--enable-alsa \
@@ -1341,6 +1347,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.396.2.8 2005/12/12 00:07:20 qboosh
+- updated info patch
+- try to build libgcjawt (but I can't test it, make consumes >450MB RAM)
+
Revision 1.396.2.7 2005/12/09 03:59:26 pluto
- more autodetecting c++ headers.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gcc.spec?r1=1.396.2.7&r2=1.396.2.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
