- proper symlink /lib/cpp (not only for %with_ada)

[packages/gcc4.git] / gcc4.spec

diff --git a/gcc4.spec b/gcc4.spec
index d87f1c3ad83becfcd16fd50cbe87a30c798ae8be..7e1bf9b6ac67d55240778bef7d5bca437efb29c8 100644 (file)
--- a/gcc4.spec
+++ b/gcc4.spec
@@ -20,20 +20,20 @@
 #              - disable internal zlib usage
 #              - translations from gcc.spec:HEAD
 #
-%define                _snap           20050130
+%define                _snap           20050213
 #
 Summary:       GNU Compiler Collection: the C compiler and shared files
 Summary(pl):   Kolekcja kompilatorów GNU: kompilator C i pliki wspó³dzielone
 Name:          gcc
 Epoch:         5
 Version:       4.0.0
-Release:       0.%{_snap}.4
+Release:       0.%{_snap}.1
 License:       GPL
 Group:         Development/Languages
 #Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
 #Source0:      ftp://gcc.gnu.org/pub/gcc/prerelease-%{version}-%{_snap}/gcc-%{version}-%{_snap}.tar.bz2
 Source0:       ftp://gcc.gnu.org/pub/gcc/snapshots/4.0-%{_snap}/%{name}-4.0-%{_snap}.tar.bz2
-# Source0-md5: 5040ba840d0367c378f73c739418b3e2
+# Source0-md5: 56c68edf4047dc42aeda22186cedb40b
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-nolocalefiles.patch
 Patch2:                %{name}-nodebug.patch
@@ -496,6 +496,7 @@ TEXCONFIG=false \
        --enable-nls \
        --with-gnu-as \
        --with-gnu-ld \
+       --with-demangler-in-ld \
        --with-system-zlib \
        --with-slibdir=%{_slibdir} \
        --without-x \
@@ -531,6 +532,7 @@ ln -sf      $RPM_BUILD_ROOT%{_bindir}/sparc64-pld-linux-gcc \
        $RPM_BUILD_ROOT%{_bindir}/sparc-pld-linux-gcc
 %endif
 
+ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT/lib/cpp
 ln -sf gcc $RPM_BUILD_ROOT%{_bindir}/cc
 echo ".so gcc.1" > $RPM_BUILD_ROOT%{_mandir}/man1/cc.1
 
@@ -549,7 +551,6 @@ ln -sf      libgnat-4.0.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnat-4.0.so
 ln -sf libgnarl-4.0.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnarl-4.0.so
 ln -sf libgnat-4.0.so $RPM_BUILD_ROOT%{_libdir}/libgnat.so
 ln -sf libgnarl-4.0.so $RPM_BUILD_ROOT%{_libdir}/libgnarl.so
-ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT/lib/cpp
 %endif
 
 cd ..
@@ -588,7 +589,7 @@ mkdir       $gccdir/tmp
 %{?with_objc:mv -f $gccdir/include/objc        $gccdir/tmp}
 mv -f  $gccdir/include/syslimits.h $gccdir/tmp
 rm -rf $gccdir/include
- mv -f $gccdir/tmp $gccdir/include
+mv -f  $gccdir/tmp $gccdir/include
 cp -f  $gccdir/install-tools/include/*.h $gccdir/include
 # but we don't want anything more from install-tools
 rm -rf $gccdir/install-tools