%bcond_without ada # build without ADA support
%bcond_without java # build without Java support
%bcond_without objc # build without objc support
-%bcond_with bootstrap # don't BR gcc(ada) (temporary for Ac upgrade bootstrap)
#
-%define snap 20040303
-%define GCC_VERSION 3.4
-%define KSI_VERSION 1.1.0.1567
-
+%define snap 20040416
+%define GCC_VERSION 3.4.0
+#
Summary: GNU Compiler Collection: the C compiler and shared files
Summary(es): Colección de compiladores GNU: el compilador C y ficheros compartidos
-Summary(pl): Kolekcja Kompilatorów GNU: kompilator C i pliki wspó³dzielone
+Summary(pl): Kolekcja kompilatorów GNU: kompilator C i pliki wspó³dzielone
Summary(pt_BR): Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
Name: gcc
Version: %{GCC_VERSION}
License: GPL
Group: Development/Languages
#Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/%{name}-%{version}.tar.bz2
-Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/%{version}-%{snap}/%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5: 1e061213c3b5ca77764ef9faa8f13677
-Source1: ftp://ftp.pld-linux.org/people/malekith/ksi/ksi-%{KSI_VERSION}.tar.gz
-# Source1-md5: 66f07491b44f06928fd95b0e65bb8cd3
-Source2: http://ep09.pld-linux.org/~djrzulf/gcc33/%{name}-non-english-man-pages.tar.bz2
-# Source2-md5: 4736f3422ddfb808423b745629acc321
+Source0: ftp://gcc.gnu.org/pub/gcc/prerelease-%{version}-%{snap}/%{name}-%{version}-%{snap}.tar.bz2
+# Source0-md5: d6e215ce39a302c643f3ea8994ef6b68
+#Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/%{version}-%{snap}/%{name}-%{version}-%{snap}.tar.bz2
+Source1: http://ep09.pld-linux.org/~djrzulf/gcc33/%{name}-non-english-man-pages.tar.bz2
+# Source1-md5: 4736f3422ddfb808423b745629acc321
Patch0: %{name}-info.patch
Patch1: %{name}-nolocalefiles.patch
Patch2: %{name}-ada-link-new-libgnat.patch
BuildRequires: binutils >= 2.14
BuildRequires: bison
BuildRequires: fileutils >= 4.0.41
-%{?with_ada:%{!?with_bootstrap:BuildRequires: gcc(ada)}}
-%{?with_ada:BuildRequires: gcc-ada}
+BuildRequires: flex
+%{?with_ada:BuildRequires: gcc-ada}
BuildRequires: gettext-devel
BuildRequires: glibc-devel >= 2.2.5-20
BuildRequires: perl-devel
Requires: binutils >= 2.14
Requires: cpp = %{epoch}:%{version}-%{release}
Requires: libgcc = %{epoch}:%{version}-%{release}
-%{?with_ada:Provides: gcc(ada)}
Conflicts: glibc-devel < 2.2.5-20
URL: http://gcc.gnu.org/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Group: Development/Libraries
Requires: libgcj = %{epoch}:%{version}-%{release}
Requires: %{name}-java
+Requires: pkgconfig
Obsoletes: libgcj3-devel
%description -n libgcj-devel
Ten pakiet zawiera biblioteki statyczne dla programów napisanych w
Adzie.
-%package ksi
-Summary: Ksi support for gcc
-Summary(es): Soporte de Ksi para gcc
-Summary(pl): Obs³uga Ksi dla gcc
-Version: %{GCC_VERSION}.%{KSI_VERSION}
-Group: Development/Languages
-Requires: gcc = %{epoch}:%{version}-%{release}
-
-%description ksi
-This package adds experimental support for compiling Ksi programs into
-native code. You proabably don't need it, unless your are going to
-develop a compiler using Ksi as intermediate representation or you are
-using such compiler (like Gont).
-
-%description ksi -l es
-Este paquete añade soporte experimental para compilar programas de Ksi
-en código nativo. Probablemento no lo necesitará, a menos que vaya a
-desarrollar un compilador que use Ksi como representación intermedia o
-use tal compilador (como Gont).
-
-%description ksi -l pl
-Ten pakiet dodaje eksperymentalne wsparcie dla kompilacji programów w
-Ksi do kodu maszynowego. Prawdopodobnie nie potrzebujesz go, chyba ¿e
-zamierzasz pisaæ kompilator u¿ywaj±cy Ksi jako reprezentacji
-po¶rednicz±cej, lub u¿ywasz takiego kompilatora (jak Gont).
-
%package -n cpp
Summary: The C Pre Processor
Summary(es): El preprocesador de C
%prep
%setup -q -a1 -n %{name}-%{version}-%{snap}
-mv ksi-%{KSI_VERSION} gcc/ksi
%patch0 -p1
%patch1 -p1
perl -pi -e 's/(version.*)";/$1 (PLD Linux)";/' gcc/version.c
perl -pi -e 's@(bug_report_url.*<URL:).*";@$1http://bugs.pld-linux.org/>";@' gcc/version.c
+mv ChangeLog ChangeLog.general
+
%build
# cd gcc && autoconf; cd ..
# autoconf is not needed!
cd ..
%{__make} -C obj-%{_target_platform} profiledbootstrap \
+ BOOT_CFLAGS="%{rpmcflags}" \
+ STAGE1_CFLAGS="%{rpmcflags}" \
LDFLAGS_FOR_TARGET="%{rpmldflags}" \
mandir=%{_mandir} \
infodir=%{_infodir}
%if %{with ada}
# move ada shared libraries to proper place...
-mv $RPM_BUILD_ROOT%{_libdir}/gcc/*/*/adalib/*.so.1 \
+mv $RPM_BUILD_ROOT%{_libdir}/gcc/*/*/adalib/*.so \
$RPM_BUILD_ROOT%{_libdir}/
-# check if symlink to be made is valid
-test -f $RPM_BUILD_ROOT%{_libdir}/libgnat-3.15.so.1
-ln -sf libgnat-3.15.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnat-3.15.so
-ln -sf libgnarl-3.15.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnarl-3.15.so
-ln -sf libgnat-3.15.so $RPM_BUILD_ROOT%{_libdir}/libgnat.so
-ln -sf libgnarl-3.15.so $RPM_BUILD_ROOT%{_libdir}/libgnarl.so
%endif
ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT/lib/cpp
perl -pi -e "s@^libdir='.*@libdir='/usr/%{_lib}'@" $RPM_BUILD_ROOT%{_libdir}/$f
done
-bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
mv -f $RPM_BUILD_ROOT%{_mandir}/ja/man1/{cccp,cpp}.1
# include/ contains install-tools/include/* and headers that were fixed up
%postun java
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-%post ksi
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
-%postun ksi
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-
%post -n cpp
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc READ* ChangeLog
+%doc ChangeLog.general MAINTAINERS bugs.html faq.html
+%doc gcc/{README.Portability,NEWS,ChangeLog}
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/*
%dir %{_libdir}/gcc/*/*
%defattr(644,root,root,755)
%doc libstdc++-v3/docs/html
%dir %{_includedir}/c++
-%{_includedir}/c++/%{version}.0
-%exclude %{_includedir}/c++/%{version}.0/*/bits/stdc++.h.gch
+%{_includedir}/c++/%{version}
+%exclude %{_includedir}/c++/%{version}/*/bits/stdc++.h.gch
%attr(755,root,root) %{_libdir}*/libstdc++.so
%{_libdir}*/libstdc++.la
%ifarch ppc
%attr(755,root,root) %{_bindir}/jcf-dump
%attr(755,root,root) %{_bindir}/jv-*
%attr(755,root,root) %{_bindir}/grepjar
-%attr(755,root,root) %{_bindir}/*-gcj
+%attr(755,root,root) %{_bindir}/*-gcj*
%attr(755,root,root) %{_libdir}/gcc/*/*/jc1
%attr(755,root,root) %{_libdir}/gcc/*/*/jvgenmain
%{_infodir}/gcj*
%defattr(644,root,root,755)
%{_includedir}/java
%{_includedir}/javax
-#%%{_includedir}/org
%{_includedir}/gcj
%{_includedir}/j*.h
%{_includedir}/gnu/*
%{_libdir}/nof/lib*cj*.la
%attr(755,root,root) %{_libdir}/nof/lib*cj*.so
%endif
+%{_pkgconfigdir}/libgcj.pc
%files -n libgcj-static
%defattr(644,root,root,755)
%if %{with ada}
%files ada
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gnat*
+%attr(755,root,root) %{_bindir}/gpr*
%attr(755,root,root) %{_libdir}/gcc/*/*/gnat1
%{_libdir}/gcc/*/*/adainclude
%dir %{_libdir}/gcc/*/*/adalib
%ifnarch ppc
%{_libdir}/gcc/*/*/adalib/libgmem.a
%endif
-%{_libdir}/gcc/*/*/adalib/Makefile.adalib
-%attr(755,root,root) %{_bindir}/gnat*
%{_infodir}/gnat*
-%attr(755,root,root) %{_libdir}/libgnat*.so
-%attr(755,root,root) %{_libdir}/libgnarl*.so
%files -n libgnat
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgna*.so.1
+%attr(755,root,root) %{_libdir}/libgnarl*.so
+%attr(755,root,root) %{_libdir}/libgnat*.so
%files -n libgnat-static
%defattr(644,root,root,755)
-%{_libdir}/gcc/*/*/adalib/libgna*.a
-%endif
-
-%if 0
-%files ksi
-%defattr(644,root,root,755)
-%doc gcc/ksi/README gcc/ksi/NEWS gcc/ksi/t/*.{ksi,c,foo}
-%{_infodir}/ksi*
-%attr(755,root,root) %{_libdir}/gcc/*/*/ksi1
+%{_libdir}/gcc/*/*/adalib/libgnarl.a
+%{_libdir}/gcc/*/*/adalib/libgnat.a
%endif
%files -n cpp