diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-08-27 15:47:52 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-08-27 15:47:52 +0000 |
| commit | cdc1b123420c0d6b7db543176366080c4b397c02 (patch) | |
| tree | 9ba337d73396555d3dc6cafef5f2dad95f8bdfe5 | |
| parent | GCC_RPMREL = 6. (diff) | |
| download | rtems-cdc1b123420c0d6b7db543176366080c4b397c02.tar.bz2 | |
Regenerate.
13 files changed, 512 insertions, 815 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 f01bdcec42..da0d9f5192 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/arm-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.10-arm-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/arm-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/arm-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/arm-rtems4.10" >> dirs - TGTDIR="%{gcclib}/arm-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/arm-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for arm-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/arm-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/arm-rtems4.10-cpp.1* %{_mandir}/man1/arm-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/arm-rtems4.10-cpp%{_exeext} %{_bindir}/arm-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/arm-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/arm-rtems4.10-gcov%{_exeext} %{_bindir}/arm-rtems4.10-gccbug -%dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "arm-rtems4.10" != "bfin-rtems4.10" %if "arm-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/arm-rtems4.10 -%dir %{gccexec}/arm-rtems4.10/%{gcc_version} -%{gccexec}/arm-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/arm-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/arm-rtems4.10 +%dir %{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for arm-rtems4.10. %{_bindir}/arm-rtems4.10-c++%{_exeext} %{_bindir}/arm-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/arm-rtems4.10 -%dir %{gccexec}/arm-rtems4.10/%{gcc_version} -%{gccexec}/arm-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/arm-rtems4.10 +%dir %{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include -%{gcclib}/arm-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for arm-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for arm-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 444871ddf4..861e697c6a 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: 5%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,16 +135,10 @@ 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-newlib = %{newlib_version}-45%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 @@ -221,7 +217,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -267,12 +263,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/avr-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.10-c++filt%{_exeext} @@ -282,18 +285,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.10-avr-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/avr-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/avr-rtems4.10/include/bits; then @@ -318,13 +316,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/avr-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/avr-rtems4.10" >> dirs - TGTDIR="%{gcclib}/avr-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -336,13 +332,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/avr-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -357,6 +352,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -411,7 +407,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -419,7 +415,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -459,7 +455,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}-45%{?dist} +# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -474,38 +470,34 @@ GNU cc compiler for avr-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/avr-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/avr-rtems4.10-cpp.1* %{_mandir}/man1/avr-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/avr-rtems4.10-cpp%{_exeext} %{_bindir}/avr-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/avr-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/avr-rtems4.10-gcov%{_exeext} %{_bindir}/avr-rtems4.10-gccbug -%dir %{gcclib}/avr-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "avr-rtems4.10" != "bfin-rtems4.10" %if "avr-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/avr-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/avr-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/avr-rtems4.10 -%dir %{gccexec}/avr-rtems4.10/%{gcc_version} -%{gccexec}/avr-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/avr-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/avr-rtems4.10 +%dir %{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -530,16 +522,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -550,9 +535,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -560,9 +543,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi @@ -576,7 +557,7 @@ Summary: C Library (newlib) for avr-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 45%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -596,7 +577,7 @@ Newlib C Library for avr-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 45%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 b111d3cad1..37044433a0 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/bfin-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.10-bfin-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/bfin-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/bfin-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/bfin-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/bfin-rtems4.10" >> dirs - TGTDIR="%{gcclib}/bfin-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/bfin-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for bfin-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/bfin-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/bfin-rtems4.10-cpp.1* %{_mandir}/man1/bfin-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/bfin-rtems4.10-cpp%{_exeext} %{_bindir}/bfin-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/bfin-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/bfin-rtems4.10-gcov%{_exeext} %{_bindir}/bfin-rtems4.10-gccbug -%dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "bfin-rtems4.10" != "bfin-rtems4.10" %if "bfin-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/bfin-rtems4.10 -%dir %{gccexec}/bfin-rtems4.10/%{gcc_version} -%{gccexec}/bfin-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/bfin-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/bfin-rtems4.10 +%dir %{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for bfin-rtems4.10. %{_bindir}/bfin-rtems4.10-c++%{_exeext} %{_bindir}/bfin-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/bfin-rtems4.10 -%dir %{gccexec}/bfin-rtems4.10/%{gcc_version} -%{gccexec}/bfin-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/bfin-rtems4.10 +%dir %{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include -%{gcclib}/bfin-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for bfin-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for bfin-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 98063fe16a..6b47e93c80 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/h8300-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.10-h8300-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/h8300-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/h8300-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/h8300-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/h8300-rtems4.10" >> dirs - TGTDIR="%{gcclib}/h8300-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/h8300-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for h8300-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/h8300-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/h8300-rtems4.10-cpp.1* %{_mandir}/man1/h8300-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/h8300-rtems4.10-cpp%{_exeext} %{_bindir}/h8300-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/h8300-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/h8300-rtems4.10-gcov%{_exeext} %{_bindir}/h8300-rtems4.10-gccbug -%dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "h8300-rtems4.10" != "bfin-rtems4.10" %if "h8300-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/h8300-rtems4.10 -%dir %{gccexec}/h8300-rtems4.10/%{gcc_version} -%{gccexec}/h8300-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/h8300-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/h8300-rtems4.10 +%dir %{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for h8300-rtems4.10. %{_bindir}/h8300-rtems4.10-c++%{_exeext} %{_bindir}/h8300-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/h8300-rtems4.10 -%dir %{gccexec}/h8300-rtems4.10/%{gcc_version} -%{gccexec}/h8300-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/h8300-rtems4.10 +%dir %{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include -%{gcclib}/h8300-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for h8300-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for h8300-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 71b925b2d8..72a837f2d1 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/i386-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.10-i386-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/i386-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/i386-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/i386-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/i386-rtems4.10" >> dirs - TGTDIR="%{gcclib}/i386-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/i386-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for i386-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/i386-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/i386-rtems4.10-cpp.1* %{_mandir}/man1/i386-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/i386-rtems4.10-cpp%{_exeext} %{_bindir}/i386-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/i386-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/i386-rtems4.10-gcov%{_exeext} %{_bindir}/i386-rtems4.10-gccbug -%dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "i386-rtems4.10" != "bfin-rtems4.10" %if "i386-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/i386-rtems4.10 -%dir %{gccexec}/i386-rtems4.10/%{gcc_version} -%{gccexec}/i386-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/i386-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/i386-rtems4.10 +%dir %{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for i386-rtems4.10. %{_bindir}/i386-rtems4.10-c++%{_exeext} %{_bindir}/i386-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/i386-rtems4.10 -%dir %{gccexec}/i386-rtems4.10/%{gcc_version} -%{gccexec}/i386-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/i386-rtems4.10 +%dir %{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include -%{gcclib}/i386-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for i386-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for i386-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 7b094922a3..2d7900b602 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/lm32-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/lm32-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/lm32-rtems4.10-lm32-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/lm32-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/lm32-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/lm32-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/lm32-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/lm32-rtems4.10" >> dirs - TGTDIR="%{gcclib}/lm32-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/lm32-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/lm32-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/lm32-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/lm32-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/lm32-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for lm32-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/lm32-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/lm32-rtems4.10-cpp.1* %{_mandir}/man1/lm32-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/lm32-rtems4.10-cpp%{_exeext} %{_bindir}/lm32-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/lm32-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/lm32-rtems4.10-gcov%{_exeext} %{_bindir}/lm32-rtems4.10-gccbug -%dir %{gcclib}/lm32-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "lm32-rtems4.10" != "bfin-rtems4.10" %if "lm32-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/lm32-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/lm32-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/lm32-rtems4.10 -%dir %{gccexec}/lm32-rtems4.10/%{gcc_version} -%{gccexec}/lm32-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/lm32-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/lm32-rtems4.10 +%dir %{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for lm32-rtems4.10. %{_bindir}/lm32-rtems4.10-c++%{_exeext} %{_bindir}/lm32-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/lm32-rtems4.10 -%dir %{gccexec}/lm32-rtems4.10/%{gcc_version} -%{gccexec}/lm32-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/lm32-rtems4.10 +%dir %{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/lm32-rtems4.10/%{gcc_version}/include -%{gcclib}/lm32-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for lm32-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for lm32-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 6681c72e34..394900f40d 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -132,24 +134,14 @@ BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m32c-rtems4.10-binutils Requires: rtems-4.10-m32c-rtems4.10-binutils -Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} @@ -224,7 +216,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -269,12 +261,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/m32c-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/m32c-rtems4.10-c++filt%{_exeext} @@ -286,18 +285,13 @@ cd .. # Conflict with a native GCC's man pages rm -rf $RPM_BUILD_ROOT%{_mandir}/man7 - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/m32c-rtems4.10-m32c-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/m32c-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m32c-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/m32c-rtems4.10/include/bits; then @@ -322,13 +316,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/m32c-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/m32c-rtems4.10" >> dirs - TGTDIR="%{gcclib}/m32c-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -340,13 +332,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/m32c-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -361,6 +352,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -415,7 +407,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32c-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m32c-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -423,7 +415,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32c-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m32c-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -463,7 +455,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}-44%{?dist} +# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -478,38 +470,34 @@ GNU cc compiler for m32c-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/m32c-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/m32c-rtems4.10-cpp.1* %{_mandir}/man1/m32c-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/m32c-rtems4.10-cpp%{_exeext} %{_bindir}/m32c-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/m32c-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/m32c-rtems4.10-gcov%{_exeext} %{_bindir}/m32c-rtems4.10-gccbug -%dir %{gcclib}/m32c-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "m32c-rtems4.10" != "bfin-rtems4.10" %if "m32c-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/m32c-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/m32c-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/m32c-rtems4.10 -%dir %{gccexec}/m32c-rtems4.10/%{gcc_version} -%{gccexec}/m32c-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/m32c-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/m32c-rtems4.10 +%dir %{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/collect2%{_exeext} @@ -522,7 +510,7 @@ Summary: C Library (newlib) for m32c-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} %description -n rtems-4.10-m32c-rtems4.10-newlib 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 cc29509512..41129b2b9d 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -132,24 +134,14 @@ BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m32r-rtems4.10-binutils Requires: rtems-4.10-m32r-rtems4.10-binutils -Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} @@ -224,7 +216,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -269,12 +261,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/m32r-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/m32r-rtems4.10-c++filt%{_exeext} @@ -286,18 +285,13 @@ cd .. # Conflict with a native GCC's man pages rm -rf $RPM_BUILD_ROOT%{_mandir}/man7 - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/m32r-rtems4.10-m32r-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/m32r-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m32r-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/m32r-rtems4.10/include/bits; then @@ -322,13 +316,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/m32r-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/m32r-rtems4.10" >> dirs - TGTDIR="%{gcclib}/m32r-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -340,13 +332,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/m32r-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -361,6 +352,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -415,7 +407,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32r-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m32r-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -423,7 +415,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32r-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m32r-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -463,7 +455,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}-44%{?dist} +# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -478,38 +470,34 @@ GNU cc compiler for m32r-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/m32r-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/m32r-rtems4.10-cpp.1* %{_mandir}/man1/m32r-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/m32r-rtems4.10-cpp%{_exeext} %{_bindir}/m32r-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/m32r-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/m32r-rtems4.10-gcov%{_exeext} %{_bindir}/m32r-rtems4.10-gccbug -%dir %{gcclib}/m32r-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "m32r-rtems4.10" != "bfin-rtems4.10" %if "m32r-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/m32r-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/m32r-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/m32r-rtems4.10 -%dir %{gccexec}/m32r-rtems4.10/%{gcc_version} -%{gccexec}/m32r-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/m32r-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/m32r-rtems4.10 +%dir %{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/collect2%{_exeext} @@ -522,7 +510,7 @@ Summary: C Library (newlib) for m32r-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} %description -n rtems-4.10-m32r-rtems4.10-newlib 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 99e757a47a..55e3f5142f 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/m68k-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.10-m68k-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m68k-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/m68k-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/m68k-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/m68k-rtems4.10" >> dirs - TGTDIR="%{gcclib}/m68k-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/m68k-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for m68k-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/m68k-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/m68k-rtems4.10-cpp.1* %{_mandir}/man1/m68k-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/m68k-rtems4.10-cpp%{_exeext} %{_bindir}/m68k-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/m68k-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/m68k-rtems4.10-gcov%{_exeext} %{_bindir}/m68k-rtems4.10-gccbug -%dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "m68k-rtems4.10" != "bfin-rtems4.10" %if "m68k-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/m68k-rtems4.10 -%dir %{gccexec}/m68k-rtems4.10/%{gcc_version} -%{gccexec}/m68k-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/m68k-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/m68k-rtems4.10 +%dir %{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for m68k-rtems4.10. %{_bindir}/m68k-rtems4.10-c++%{_exeext} %{_bindir}/m68k-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/m68k-rtems4.10 -%dir %{gccexec}/m68k-rtems4.10/%{gcc_version} -%{gccexec}/m68k-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/m68k-rtems4.10 +%dir %{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include -%{gcclib}/m68k-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for m68k-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for m68k-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 228908c75d..b9fffe16b7 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/mips-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.10-mips-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/mips-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/mips-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/mips-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/mips-rtems4.10" >> dirs - TGTDIR="%{gcclib}/mips-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/mips-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for mips-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/mips-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/mips-rtems4.10-cpp.1* %{_mandir}/man1/mips-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/mips-rtems4.10-cpp%{_exeext} %{_bindir}/mips-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/mips-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/mips-rtems4.10-gcov%{_exeext} %{_bindir}/mips-rtems4.10-gccbug -%dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "mips-rtems4.10" != "bfin-rtems4.10" %if "mips-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/mips-rtems4.10 -%dir %{gccexec}/mips-rtems4.10/%{gcc_version} -%{gccexec}/mips-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/mips-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/mips-rtems4.10 +%dir %{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for mips-rtems4.10. %{_bindir}/mips-rtems4.10-c++%{_exeext} %{_bindir}/mips-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/mips-rtems4.10 -%dir %{gccexec}/mips-rtems4.10/%{gcc_version} -%{gccexec}/mips-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/mips-rtems4.10 +%dir %{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include -%{gcclib}/mips-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for mips-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for mips-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 aac576b386..46801d9ffd 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/powerpc-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.10-powerpc-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/powerpc-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/powerpc-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/powerpc-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/powerpc-rtems4.10" >> dirs - TGTDIR="%{gcclib}/powerpc-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/powerpc-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for powerpc-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/powerpc-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/powerpc-rtems4.10-cpp.1* %{_mandir}/man1/powerpc-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/powerpc-rtems4.10-cpp%{_exeext} %{_bindir}/powerpc-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/powerpc-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/powerpc-rtems4.10-gcov%{_exeext} %{_bindir}/powerpc-rtems4.10-gccbug -%dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "powerpc-rtems4.10" != "bfin-rtems4.10" %if "powerpc-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/powerpc-rtems4.10 -%dir %{gccexec}/powerpc-rtems4.10/%{gcc_version} -%{gccexec}/powerpc-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/powerpc-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/powerpc-rtems4.10 +%dir %{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for powerpc-rtems4.10. %{_bindir}/powerpc-rtems4.10-c++%{_exeext} %{_bindir}/powerpc-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/powerpc-rtems4.10 -%dir %{gccexec}/powerpc-rtems4.10/%{gcc_version} -%{gccexec}/powerpc-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/powerpc-rtems4.10 +%dir %{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include -%{gcclib}/powerpc-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for powerpc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 17d8e3787f..cbf1d454d9 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/sh-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.10-sh-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sh-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/sh-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/sh-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/sh-rtems4.10" >> dirs - TGTDIR="%{gcclib}/sh-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/sh-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for sh-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/sh-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/sh-rtems4.10-cpp.1* %{_mandir}/man1/sh-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/sh-rtems4.10-cpp%{_exeext} %{_bindir}/sh-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/sh-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/sh-rtems4.10-gcov%{_exeext} %{_bindir}/sh-rtems4.10-gccbug -%dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "sh-rtems4.10" != "bfin-rtems4.10" %if "sh-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/sh-rtems4.10 -%dir %{gccexec}/sh-rtems4.10/%{gcc_version} -%{gccexec}/sh-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/sh-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/sh-rtems4.10 +%dir %{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for sh-rtems4.10. %{_bindir}/sh-rtems4.10-c++%{_exeext} %{_bindir}/sh-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/sh-rtems4.10 -%dir %{gccexec}/sh-rtems4.10/%{gcc_version} -%{gccexec}/sh-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/sh-rtems4.10 +%dir %{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include -%{gcclib}/sh-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for sh-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for sh-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info 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 22266a679e..821b56a5eb 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: 4%{?dist} +Release: 6%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -100,6 +100,8 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %{?fc10:%global mpfr_provided 2.3.2} %{?fc11:%global mpfr_provided 2.4.1} %{?suse10_3:%global mpfr_provided 2.2.1} +%{?suse11_0:%global mpfr_provided 2.3.1} +%{?suse11_1:%global mpfr_provided 2.3.2} %{?cygwin:%global mpfr_provided 2.4.1} %{?mingw32:%global mpfr_provided %{nil}} @@ -133,30 +135,17 @@ 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-newlib = %{newlib_version}-44%{?dist} +Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-46%{?dist} -%if "%{gcc_version}" >= "3.4" -%define gcclib %{_libdir}/gcc -%define gccexec %{_libexecdir}/gcc -%else -%define gcclib %{_libdir}/gcc-lib -%define gccexec %{_libdir}/gcc-lib -%endif +%define _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff -%endif %if "%{gcc_version}" == "4.4.1" Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.0" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.1" Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif @@ -236,7 +225,7 @@ cd .. --bindir=%{_bindir} \ --exec_prefix=%{_exec_prefix} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_gcclibdir} \ --libexecdir=%{_libexecdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -282,12 +271,19 @@ cd .. # Misplaced header file if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{gcclib}/sparc-rtems4.10/%{gcc_version}/include/ + $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include/ fi %endif # host library +%if "%{gcc_version}" >= "4.2.0" + # libiberty doesn't honor --libdir, but always installs to a + # magically guessed _libdir rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a +%else + # libiberty installs to --libdir=... + rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a +%endif # We use the version from binutils rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.10-c++filt%{_exeext} @@ -297,18 +293,13 @@ cd .. rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir - -%if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.10-sparc-rtems4.10-gcjh%{_exeext} -%endif -%if "%{gcc_version}" >= "3.3" # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.10/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sparc-rtems4.10/%{gcc_version}/install-tools -%endif + rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/install-tools + rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/install-tools # Bug in gcc > 4.1.0: Installs an unused, empty directory if test -d ${RPM_BUILD_ROOT}%{_prefix}/sparc-rtems4.10/include/bits; then @@ -333,13 +324,11 @@ cd .. echo "%defattr(-,root,root,-)" >> dirs echo "%dir %{_prefix}" >> dirs echo "%dir %{_libdir}" >> dirs -%if "%{gcc_version}" >= "3.4" echo "%dir %{_libexecdir}" >> dirs -%endif - echo "%dir %{gcclib}" >> dirs - echo "%dir %{gcclib}/sparc-rtems4.10" >> dirs + echo "%dir %{_gcclibdir}/gcc" >> dirs + echo "%dir %{_gcclibdir}/gcc/sparc-rtems4.10" >> dirs - TGTDIR="%{gcclib}/sparc-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}" for i in $f; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs @@ -351,13 +340,12 @@ cd .. # Collect files to go into different packages cp dirs build/files.gcc - cp dirs build/files.g77 cp dirs build/files.gfortran cp dirs build/files.objc cp dirs build/files.gcj cp dirs build/files.g++ - TGTDIR="%{gcclib}/sparc-rtems4.10/%{gcc_version}" + TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}" f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; for i in $f; do case $i in @@ -372,6 +360,7 @@ cd .. *include/objc*) ;; *include/g++*);; *include/c++*);; + *finclude/*);; *adainclude*);; *adalib*);; *gnat1);; @@ -426,7 +415,7 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.10/' | %__find_provides + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.10/'} | %__find_provides EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides @@ -434,7 +423,7 @@ chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires #!/bin/sh grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.10/(lib|include|sys-root)' \ - | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.10/' | %__find_requires + %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.10/'} | %__find_requires EOF chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires @@ -474,7 +463,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}-44%{?dist} +# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-46%{?dist} # License: GPL # %if %build_infos @@ -489,38 +478,34 @@ GNU cc compiler for sparc-rtems4.10. %dir %{_mandir} %dir %{_mandir}/man1 %{_mandir}/man1/sparc-rtems4.10-gcc.1* -%if "%{gcc_version}" >= "3.4" %{_mandir}/man1/sparc-rtems4.10-cpp.1* %{_mandir}/man1/sparc-rtems4.10-gcov.1* -%endif %dir %{_bindir} %{_bindir}/sparc-rtems4.10-cpp%{_exeext} %{_bindir}/sparc-rtems4.10-gcc%{_exeext} -%if "%{gcc_version}" >= "3.3" %{_bindir}/sparc-rtems4.10-gcc-%{gcc_version}%{_exeext} -%endif %{_bindir}/sparc-rtems4.10-gcov%{_exeext} %{_bindir}/sparc-rtems4.10-gccbug -%dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include +%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" %if "sparc-rtems4.10" != "bfin-rtems4.10" %if "sparc-rtems4.10" != "avr-rtems4.10" -%dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include/ssp +%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include/ssp %endif %endif %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include-fixed +%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include-fixed %endif -%dir %{gccexec} -%dir %{gccexec}/sparc-rtems4.10 -%dir %{gccexec}/sparc-rtems4.10/%{gcc_version} -%{gccexec}/sparc-rtems4.10/%{gcc_version}/cc1%{_exeext} -%{gccexec}/sparc-rtems4.10/%{gcc_version}/collect2%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/sparc-rtems4.10 +%dir %{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/collect2%{_exeext} # ============================================================== # rtems-4.10-gcc-common @@ -545,16 +530,9 @@ GCC files that are shared by all targets. %{_infodir}/cppinternals.info* %{_infodir}/gcc.info* %{_infodir}/gccint.info* -%if "%{gcc_version}" >= "3.4" %{_infodir}/gccinstall.info* -%endif %dir %{_mandir} -%if "%{gcc_version}" < "3.4" -%dir %{_mandir}/man1 -%{_mandir}/man1/cpp.1* -%{_mandir}/man1/gcov.1* -%endif %dir %{_mandir}/man7 %{_mandir}/man7/fsf-funding.7* %{_mandir}/man7/gfdl.7* @@ -565,9 +543,7 @@ GCC files that are shared by all targets. /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif %preun -n rtems-4.10-gcc-common if [ $1 -eq 0 ]; then @@ -575,9 +551,7 @@ if [ $1 -eq 0 ]; then /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : -%if "%{gcc_version}" >= "3.4" /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -%endif fi # ============================================================== @@ -608,13 +582,13 @@ GCC c++ compiler for sparc-rtems4.10. %{_bindir}/sparc-rtems4.10-c++%{_exeext} %{_bindir}/sparc-rtems4.10-g++%{_exeext} -%dir %{gccexec} -%dir %{gccexec}/sparc-rtems4.10 -%dir %{gccexec}/sparc-rtems4.10/%{gcc_version} -%{gccexec}/sparc-rtems4.10/%{gcc_version}/cc1plus%{_exeext} +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/sparc-rtems4.10 +%dir %{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version} +%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/cc1plus%{_exeext} -%dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include -%{gcclib}/sparc-rtems4.10/%{gcc_version}/include/c++ +%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include +%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include/c++ @@ -626,7 +600,7 @@ Summary: C Library (newlib) for sparc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} Requires: rtems-4.10-newlib-common @@ -646,7 +620,7 @@ Newlib C Library for sparc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 44%{?dist} +Release: 46%{?dist} License: Distributable Requires(post): /sbin/install-info |