From c3e937868a7c0b4c6bfe27b10db75c08a1ff7336 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 18 May 2011 13:53:47 +0000 Subject: Regenerate. --- .../arm/rtems-4.10-arm-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../avr/rtems-4.10-avr-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../bfin/rtems-4.10-bfin-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../h8300/rtems-4.10-h8300-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../i386/rtems-4.10-i386-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../lm32/rtems-4.10-lm32-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../m32c/rtems-4.10-m32c-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../m32r/rtems-4.10-m32r-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../m68k/rtems-4.10-m68k-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../mips/rtems-4.10-mips-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec | 42 +++++++++++++--------- .../sparc/rtems-4.10-sparc-rtems4.10-gcc.spec | 42 +++++++++++++--------- 13 files changed, 325 insertions(+), 221 deletions(-) diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec index 06d600a66f..e2ccffa900 100644 --- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: arm-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-arm-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-arm-rtems4.10-binutils Requires: rtems-4.10-arm-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.10-arm-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-arm-rtems4.10-binutils -# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for arm-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-arm-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc arm-rtems4.10-gcc. %{_bindir}/arm-rtems4.10-gcc%{_exeext} %{_bindir}/arm-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/arm-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/arm-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for arm-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for arm-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec index 698f17801e..513c43ff73 100644 --- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: avr-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-avr-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-avr-rtems4.10-binutils Requires: rtems-4.10-avr-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -269,7 +269,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-201 %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -316,8 +316,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -347,7 +350,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -391,7 +394,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -443,6 +446,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.10-avr-rtems4.10-gcjh%{_exeext} @@ -616,7 +622,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-avr-rtems4.10-binutils -# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -634,7 +640,7 @@ Summary: libgcc for avr-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-avr-rtems4.10-gcc-libgcc @@ -656,7 +662,9 @@ libgcc avr-rtems4.10-gcc. %{_bindir}/avr-rtems4.10-gcc%{_exeext} %{_bindir}/avr-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/avr-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/avr-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -747,7 +755,7 @@ Summary: C Library (newlib) for avr-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -768,7 +776,7 @@ Newlib C Library for avr-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec index 3512c52920..b0ef184eeb 100644 --- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: bfin-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-bfin-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-bfin-rtems4.10-binutils Requires: rtems-4.10-bfin-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.10-bfin-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-bfin-rtems4.10-binutils -# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for bfin-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-bfin-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc bfin-rtems4.10-gcc. %{_bindir}/bfin-rtems4.10-gcc%{_exeext} %{_bindir}/bfin-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/bfin-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/bfin-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for bfin-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for bfin-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec index ec2b208f6e..63bdbab0a5 100644 --- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: h8300-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-h8300-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-h8300-rtems4.10-binutils Requires: rtems-4.10-h8300-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.10-h8300-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-h8300-rtems4.10-binutils -# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for h8300-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-h8300-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc h8300-rtems4.10-gcc. %{_bindir}/h8300-rtems4.10-gcc%{_exeext} %{_bindir}/h8300-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/h8300-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/h8300-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for h8300-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for h8300-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec index 2eddfb8a40..6fb8f6696d 100644 --- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: i386-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-i386-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-i386-rtems4.10-binutils Requires: rtems-4.10-i386-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.10-i386-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-i386-rtems4.10-binutils -# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for i386-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-i386-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc i386-rtems4.10-gcc. %{_bindir}/i386-rtems4.10-gcc%{_exeext} %{_bindir}/i386-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/i386-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/i386-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for i386-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for i386-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec index ff2fe03b2a..583551f23a 100644 --- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: lm32-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-lm32-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-lm32-rtems4.10-binutils Requires: rtems-4.10-lm32-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/lm32-rtems4.10-lm32-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-lm32-rtems4.10-binutils -# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for lm32-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-lm32-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc lm32-rtems4.10-gcc. %{_bindir}/lm32-rtems4.10-gcc%{_exeext} %{_bindir}/lm32-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/lm32-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/lm32-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for lm32-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for lm32-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec index 58d47a2a64..5ae7a36e75 100644 --- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: m32c-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-m32c-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-m32c-rtems4.10-binutils Requires: rtems-4.10-m32c-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -269,7 +269,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-201 %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -316,8 +316,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -347,7 +350,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -391,7 +394,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -443,6 +446,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/m32c-rtems4.10-m32c-rtems4.10-gcjh%{_exeext} @@ -616,7 +622,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m32c-rtems4.10-binutils -# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -634,7 +640,7 @@ Summary: libgcc for m32c-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-m32c-rtems4.10-gcc-libgcc @@ -656,7 +662,9 @@ libgcc m32c-rtems4.10-gcc. %{_bindir}/m32c-rtems4.10-gcc%{_exeext} %{_bindir}/m32c-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/m32c-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/m32c-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -748,7 +756,7 @@ Summary: C Library (newlib) for m32c-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -769,7 +777,7 @@ Newlib C Library for m32c-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec index 0f2a7fcb27..6b594bdace 100644 --- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: m32r-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-m32r-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-m32r-rtems4.10-binutils Requires: rtems-4.10-m32r-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -269,7 +269,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-201 %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -316,8 +316,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -347,7 +350,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -391,7 +394,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -443,6 +446,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/m32r-rtems4.10-m32r-rtems4.10-gcjh%{_exeext} @@ -616,7 +622,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m32r-rtems4.10-binutils -# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -634,7 +640,7 @@ Summary: libgcc for m32r-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-m32r-rtems4.10-gcc-libgcc @@ -656,7 +662,9 @@ libgcc m32r-rtems4.10-gcc. %{_bindir}/m32r-rtems4.10-gcc%{_exeext} %{_bindir}/m32r-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/m32r-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/m32r-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -748,7 +756,7 @@ Summary: C Library (newlib) for m32r-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -769,7 +777,7 @@ Newlib C Library for m32r-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec index 18a8be555d..d851bce555 100644 --- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: m68k-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-m68k-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-m68k-rtems4.10-binutils Requires: rtems-4.10-m68k-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.10-m68k-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-m68k-rtems4.10-binutils -# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for m68k-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-m68k-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc m68k-rtems4.10-gcc. %{_bindir}/m68k-rtems4.10-gcc%{_exeext} %{_bindir}/m68k-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/m68k-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/m68k-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for m68k-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for m68k-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec index d96fd7007a..1b34661ac0 100644 --- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: mips-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-mips-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-mips-rtems4.10-binutils Requires: rtems-4.10-mips-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.10-mips-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-mips-rtems4.10-binutils -# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for mips-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-mips-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc mips-rtems4.10-gcc. %{_bindir}/mips-rtems4.10-gcc%{_exeext} %{_bindir}/mips-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/mips-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/mips-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for mips-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for mips-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec index 594085326f..4e89e21dad 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: powerpc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-powerpc-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-powerpc-rtems4.10-binutils Requires: rtems-4.10-powerpc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.10-powerpc-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-powerpc-rtems4.10-binutils -# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for powerpc-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc powerpc-rtems4.10-gcc. %{_bindir}/powerpc-rtems4.10-gcc%{_exeext} %{_bindir}/powerpc-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/powerpc-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/powerpc-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for powerpc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec index 638c957131..c0b1526748 100644 --- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: sh-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-sh-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-sh-rtems4.10-binutils Requires: rtems-4.10-sh-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.10-sh-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-sh-rtems4.10-binutils -# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for sh-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-sh-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc sh-rtems4.10-gcc. %{_bindir}/sh-rtems4.10-gcc%{_exeext} %{_bindir}/sh-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/sh-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/sh-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for sh-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for sh-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec index 66e05f07a8..276f3bb4df 100644 --- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec +++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec @@ -58,7 +58,7 @@ Summary: sparc-rtems4.10 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -89,6 +89,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global libelf_version 0.8.13 # versions of libraries these distros are known to ship +%if 0%{?fc16} +%global mpc_provided 0.8.3 +%global mpfr_provided 3.0.0 +%global gmp_provided 4.3.2 +%endif + %if 0%{?fc15} %global mpc_provided 0.8.3 %global mpfr_provided 3.0.0 @@ -119,12 +125,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif -%if 0%{?suse11_2} -%global mpc_provided 0.7 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -212,10 +212,10 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} +%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif @@ -245,7 +245,7 @@ BuildRequires: rtems-4.10-sparc-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-sparc-rtems4.10-binutils Requires: rtems-4.10-sparc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-25%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -277,7 +277,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar %if "%{newlib_version}" == "1.18.0" Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110419.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20110518.diff %endif %{?_without_sources:NoSource: 50} @@ -328,8 +328,11 @@ cd .. # Copy the C library into gcc's source tree ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %if %{with gcc_stdint} -rm newlib-%{newlib_version}/newlib/libc/include/stdint.h + rm gcc-%{gcc_pkgvers}/newlib/libc/include/stdint.h %endif + # Make sure not to be using GPL'ed sources + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux + rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos %if 0%{?_build_mpfr} %setup -q -T -D -n %{name}-%{version} -a60 @@ -359,7 +362,7 @@ rm newlib-%{newlib_version}/newlib/libc/include/stdint.h ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -404,7 +407,7 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > %{?with_lto:--enable-lto}%{!?with_lto:--disable-lto} \ %{?with_plugin:--enable-plugin}%{!?with_plugin:--disable-plugin} \ --enable-newlib-io-c99-formats \ - --enable-languages="$languages" $optargs + --enable-languages="$languages" %if "%_host" != "%_build" # Bug in gcc-3.2.1: @@ -456,6 +459,9 @@ echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-24%{?dist}" > rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir + # We don't want libffi's man-pages + rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* + # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.10-sparc-rtems4.10-gcjh%{_exeext} @@ -629,7 +635,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.10-sparc-rtems4.10-binutils -# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-24%{?dist} +# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-25%{?dist} # License: GPL # %if %build_infos @@ -647,7 +653,7 @@ Summary: libgcc for sparc-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-24%{?dist} +Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-25%{?dist} License: GPL %description -n rtems-4.10-sparc-rtems4.10-gcc-libgcc @@ -669,7 +675,9 @@ libgcc sparc-rtems4.10-gcc. %{_bindir}/sparc-rtems4.10-gcc%{_exeext} %{_bindir}/sparc-rtems4.10-gcc-%{gcc_version}%{_exeext} %{_bindir}/sparc-rtems4.10-gcov%{_exeext} +%if "%{gcc_version}" < "4.6.0" %{_bindir}/sparc-rtems4.10-gccbug +%endif %dir %{_libexecdir} %dir %{_libexecdir}/gcc @@ -821,7 +829,7 @@ Summary: C Library (newlib) for sparc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -842,7 +850,7 @@ Newlib C Library for sparc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 24%{?dist} +Release: 25%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable -- cgit v1.2.3