- increase mem used by GC; rel 0.2

[packages/gcc.git] / gcc.spec

diff --git a/gcc.spec b/gcc.spec
index b5cbc377fe61b3b706e4638fb6ec70fa19b745ec..49739db6a4e323d059e2bf347e51d6505b3403f1 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,11 +1,12 @@
 #
 # Conditional build:
-# _without_ada - build without ADA support
-# _without_java        - build without Java support
+# _without_ada  - build without ADA support
+# _without_java - build without Java support
+# _without_objc - build without objc support
 #
 %define                DASHED_SNAP     %{nil}
 %define                SNAP            %(echo %{DASHED_SNAP} | sed -e "s#-##g")
-%define                GCC_VERSION     3.2.1
+%define                GCC_VERSION     3.2.2
 %define                KSI_VERSION     pre55
 %define                EPOCH           5
 
@@ -13,7 +14,7 @@ Summary:      GNU Compiler Collection
 Summary(pl):   Kolekcja kompilatorów GNU
 Name:          gcc
 Version:       %{GCC_VERSION}
-Release:       1
+Release:       0.2
 Epoch:         %{EPOCH}
 License:       GPL
 Group:         Development/Languages
@@ -25,7 +26,7 @@ Patch1:               %{name}-paths.patch
 Patch2:                %{name}-ada-no-addr2line.patch
 Patch3:                %{name}-ada-no-prefix.o.patch
 Patch4:                %{name}-nolocalefiles.patch
-
+Patch5:                %{name}-gcc-page.c.patch
 Patch6:                %{name}-info.patch
 # -- stolen patches from RH --
 Patch10:       gcc32-ada-link.patch
@@ -46,7 +47,7 @@ Patch24:      gcc32-duplicate-decl.patch
 Patch25:       gcc32-dwarf2-pr6381.patch
 Patch26:       gcc32-dwarf2-pr6436-test.patch
 Patch27:       gcc32-fde-merge-compat.patch
-Patch28:       gcc32-fold-const-associate.patch
+
 Patch29:       gcc32-hard-reg-sharing.patch
 Patch30:       gcc32-hard-reg-sharing2.patch
 Patch31:       gcc32-i386-default-momit-leaf-frame-pointer.patch
@@ -72,7 +73,6 @@ BuildRequires:        fileutils >= 4.0.41
 BuildRequires: gcc
 %{!?_without_ada:BuildRequires:        gcc-ada}
 BuildRequires: glibc-devel >= 2.2.5-20
-%{!?_without_dist_kernel:BuildRequires: kernel-headers}
 BuildRequires: perl-devel
 BuildRequires: texinfo >= 4.1
 BuildRequires: zlib-devel
@@ -503,16 +503,17 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
-%patch10
+#%patch10
 %patch11
 %patch12
 %patch13
 %patch14
 %patch15
-%patch16
+#%patch16
 %patch17
 %patch18
 %patch19
@@ -524,7 +525,6 @@ mv ksi-%{KSI_VERSION} gcc/ksi
 %patch25
 %patch26
 %patch27
-%patch28
 %patch29
 %patch30
 %patch31
@@ -563,7 +563,7 @@ TEXCONFIG=false ../configure \
        --enable-shared \
        --enable-threads=posix \
        --enable-__cxa_atexit \
-        --enable-languages="c,c++,f77,gcov,objc,ksi%{!?_without_ada:,ada}%{!?_without_java:,java}" \
+        --enable-languages="c,c++,f77,gcov%{?!_without_objc:,objc},ksi%{!?_without_ada:,ada}%{!?_without_java:,java}" \
        --enable-c99 \
        --enable-long-long \
        --enable-multilib \
@@ -621,12 +621,12 @@ echo .so g77.1 > $RPM_BUILD_ROOT%{_mandir}/man1/f77.1
 
 %if %{!?_without_ada:1}%{?_without_ada:0}
 # move ada shared libraries to proper place...
-mv $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*-*so.1 \
+mv $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*-*so \
        $RPM_BUILD_ROOT%{_libdir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*.so.1
+rm -f $RPM_BUILD_ROOT%{_libdir}/gcc-lib/%{_target_cpu}*/*/adalib/*.so
 (cd $RPM_BUILD_ROOT%{_libdir} && \
- ln -s libgnat-*so.1 libgnat.so.1   && ln -s libgnat-*so.1 libgnat.so && \
- ln -s libgnarl-*so.1 libgnarl.so.1 && ln -s libgnarl-*so.1 libgnarl.so)
+ ln -s libgnat-*so libgnat.so.1   && ln -s libgnat-*so libgnat.so && \
+ ln -s libgnarl-*so libgnarl.so.1 && ln -s libgnarl-*so libgnarl.so)
 %endif
 
 ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT/lib/cpp
@@ -644,10 +644,17 @@ cp -f libjava/doc/cni.sgml libjava/READ* java-doc
 cp -f fastjar/README java-doc/README.fastjar
 cp -f libffi/README java-doc/README.libffi
 cp -f libffi/LICENSE java-doc/LICENSE.libffi
+%endif
 
+%if %{?!_without_objc:1}0
 cp -f libobjc/README gcc/objc/README.libobjc
 %endif
 
+# avoid -L poisoning in *.la - there should be only -L%{_libdir}/gcc-lib/*/%{version}
+for f in libstdc++.la %{!?_without_java:libgcj.la} ; do
+       perl -pi -e 's@-L[^ ]*[acs.] @@g' $RPM_BUILD_ROOT%{_libdir}/$f
+done
+
 bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 mv -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/{cccp,cpp}.1
 
@@ -798,6 +805,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/nof/libstdc++.a
 %endif
 
+%if %{?!_without_objc:1}0
 %files objc
 %defattr(644,root,root,755)
 %doc gcc/objc/READ*
@@ -823,6 +831,7 @@ rm -rf $RPM_BUILD_ROOT
 %ifarch ppc
 %{_libdir}/nof/libobjc.a
 %endif
+%endif
 
 %files g77
 %defattr(644,root,root,755)
@@ -895,6 +904,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/j*.h
 %{_includedir}/gnu/*
 %{_libdir}/gcc-lib/%{_target_cpu}*/*/include/gcj
+%dir %{_libdir}/security
 %{_libdir}/security/*
 %dir %{_datadir}/java
 %{_datadir}/java/libgcj*.jar
@@ -902,7 +912,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*cj*.la
 %attr(755,root,root) %{_libdir}/lib*cj*.so
 %ifarch ppc
-%{_libdir}/nof/lib*cj.spec
 %{_libdir}/nof/lib*cj*.la
 %attr(755,root,root) %{_libdir}/nof/lib*cj*.so
 %endif
@@ -933,7 +942,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libgnat
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgna*-*so.1
+%attr(755,root,root) %{_libdir}/libgna*-*so
 
 %files -n libgnat-static
 %defattr(644,root,root,755)