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

[packages/gcc4.git] / gcc4.spec

diff --git a/gcc4.spec b/gcc4.spec
index b18e45ae19178447b197a07b87efacba22a16fed..7e1bf9b6ac67d55240778bef7d5bca437efb29c8 100644 (file)
--- a/gcc4.spec
+++ b/gcc4.spec
@@ -1,36 +1,44 @@
 #
 # Conditional build:
-#
+%bcond_without ada             # build without ADA support
+%bcond_without fortran         # build without Fortran support
 %bcond_without java            # build without Java support
+%bcond_without objc            # build without ObjC support
+
+%bcond_with    bootstrap
+
+%if %{with bootstrap}
+%undefine      with_fortran
+%undefine      with_java
+%undefine      with_objc
+%endif
+
 #
 # TODO:
 #              - http://gcc.gnu.org/PR11203 (inline-asm)
 #              - http://gcc.gnu.org/PR18648 (missed tree-optimization)
 #              - disable internal zlib usage
-#              - bconds (ada, objc, fortran)
 #              - translations from gcc.spec:HEAD
 #
-%define                _snap           20050102
+%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}.0.2
+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: d5bf439e5a0653f503aaf6bf28609e33
+# Source0-md5: 56c68edf4047dc42aeda22186cedb40b
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-nolocalefiles.patch
 Patch2:                %{name}-nodebug.patch
 Patch3:                %{name}-ada-link-new-libgnat.patch
 Patch4:                %{name}-ada-link.patch
-Patch5:                %{name}-pr18910.patch
-Patch6:                %{name}-pr19030.patch
 URL:           http://gcc.gnu.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -38,8 +46,10 @@ BuildRequires:       binutils >= 2:2.15.94.0.1
 BuildRequires: bison
 BuildRequires: fileutils >= 4.0.41
 BuildRequires: flex
+%if %{with ada}
 BuildRequires: gcc(ada)
 BuildRequires: gcc-ada
+%endif
 BuildRequires: gettext-devel
 BuildRequires: glibc-devel >= 2.2.5-20
 BuildRequires: gmp-devel
@@ -50,7 +60,7 @@ BuildRequires:        zlib-devel
 Requires:      binutils >= 2:2.15.94.0.1
 Requires:      libgcc = %{epoch}:%{version}-%{release}
 Provides:      cpp = %{epoch}:%{version}-%{release}
-Provides:      gcc(ada)
+%{?with_ada:Provides:  gcc(ada)}
 Obsoletes:     cpp
 Obsoletes:     egcs-cpp
 Obsoletes:     gcc-cpp
@@ -441,13 +451,11 @@ Statyczne biblioteki Obiektowego C.
 # final
 #setup -q -n gcc-%{version}
 
-#patch0 -p1    NEEDS UPDATE
+%patch0 -p1
 %patch1 -p1
 %{!?debug:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 # because we distribute modified version of gcc...
 perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c
@@ -477,7 +485,7 @@ TEXCONFIG=false \
        --enable-shared \
        --enable-threads=posix \
        --enable-__cxa_atexit \
-       --enable-languages="c,c++,f95,objc,ada%{?with_java:,java}" \
+       --enable-languages="c,c++%{?with_fortran:,f95}%{?with_objc:,objc}%{?with_ada:,ada}%{?with_java:,java}" \
        --enable-c99 \
        --enable-long-long \
 %ifarch amd64
@@ -488,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 \
@@ -497,10 +506,10 @@ TEXCONFIG=false \
 cd ..
 
 %{__make} -C obj-%{_target_platform} \
-       profiledbootstrap \
+       %{!?with_bootstrap:profiledbootstrap} \
        GCJFLAGS="%{rpmcflags}" \
        BOOT_CFLAGS="%{rpmcflags}" \
-       STAGE1_CFLAGS="%{rpmcflags}" \
+       STAGE1_CFLAGS="%{rpmcflags} -O0" \
        LDFLAGS_FOR_TARGET="%{rpmldflags}" \
        mandir=%{_mandir} \
        infodir=%{_infodir}
@@ -523,12 +532,16 @@ 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
 
+%if %{with fortran}
 ln -sf gfortran $RPM_BUILD_ROOT%{_bindir}/g95
 echo ".so gfortran.1" > $RPM_BUILD_ROOT%{_mandir}/man1/g95.1
+%endif
 
+%if %{with ada}
 # move ada shared libraries to proper place...
 mv -f  $RPM_BUILD_ROOT%{_libdir}/gcc/*/*/adalib/*.so.1 \
        $RPM_BUILD_ROOT%{_libdir}
@@ -538,7 +551,7 @@ 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 ..
 
@@ -549,7 +562,9 @@ 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 %{with objc}
 cp -f  libobjc/README gcc/objc/README.libobjc
+%endif
 
 # avoid -L poisoning in *.la - there should be only -L%{_libdir}/gcc/*/%{version}
 for f in libstdc++.la libsupc++.la %{?with_java:libgcj.la};
@@ -557,8 +572,10 @@ do
        perl -pi -e 's@-L[^ ]*[acs.] @@g' $RPM_BUILD_ROOT%{_libdir}/$f
 done
 # normalize libdir, to avoid propagation of unnecessary RPATHs by libtool
-for f in libstdc++.la libsupc++.la libgfortran.la libgfortranbegin.la \
-       %{?with_java:libgcj.la lib-org-w3c-dom.la lib-org-xml-sax.la libffi.la} libobjc.la;
+for f in libstdc++.la libsupc++.la \
+       %{?with_fortran:libgfortran.la libgfortranbegin.la} \
+       %{?with_java:libgcj.la lib-org-w3c-dom.la lib-org-xml-sax.la libffi.la} \
+       %{?with_objc:libobjc.la};
 do
        perl -pi -e "s@^libdir='.*@libdir='/usr/%{_lib}'@" $RPM_BUILD_ROOT%{_libdir}/$f
 done
@@ -568,13 +585,12 @@ done
 gccdir=$(echo $RPM_BUILD_ROOT%{_libdir}/gcc/*/*/)
 mkdir  $gccdir/tmp
 # we have to save these however
-mv -f  $gccdir/include/{%{?with_java:gcj,libffi/ffitarget.h,}objc,syslimits.h} \
-       $gccdir/tmp
+%{?with_java:mv -f $gccdir/include/{gcj,libffi/ffitarget.h} $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
-cp -f  $gccdir/install-tools/include/*.h \
-       $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
 
@@ -691,6 +707,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libmudflap*.a
 
+%if %{with ada}
 %files ada
 %defattr(644,root,root,755)
 %doc gcc/ada/ChangeLog
@@ -719,6 +736,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/gcc/*/*/adalib/libgnarl.a
 %{_libdir}/gcc/*/*/adalib/libgnat.a
+%endif
 
 %files c++
 %defattr(644,root,root,755)
@@ -756,6 +774,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libstdc++.a
 
+%if %{with fortran}
 %files fortran
 %defattr(644,root,root,755)
 %doc gcc/fortran/ChangeLog
@@ -778,6 +797,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgfortran-static
 %defattr(644,root,root,755)
 %{_libdir}/libgfortran.a
+%endif
 
 %if %{with java}
 %files java
@@ -824,8 +844,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gcc/*/*/include/gcj
 %dir %{_libdir}/security
 %{_libdir}/security/*
-%dir %{_datadir}/java
-%{_datadir}/java/libgcj*.jar
+%{_javadir}/libgcj*.jar
 %{_libdir}/lib*cj.spec
 %{_libdir}/lib*cj*.la
 %attr(755,root,root) %{_libdir}/lib*cj*.so
@@ -858,6 +877,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libffi.a
 %endif
 
+%if %{with objc}
 %files objc
 %defattr(644,root,root,755)
 %doc gcc/objc/README
@@ -874,3 +894,4 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libobjc-static
 %defattr(644,root,root,755)
 %{_libdir}/libobjc.a
+%endif