diff options
Diffstat (limited to 'contrib/crossrpms/rtems4.10')
55 files changed, 677 insertions, 986 deletions
diff --git a/contrib/crossrpms/rtems4.10/arm/Makefile.am b/contrib/crossrpms/rtems4.10/arm/Makefile.am index 614b744911..4320677f8c 100644 --- a/contrib/crossrpms/rtems4.10/arm/Makefile.am +++ b/contrib/crossrpms/rtems4.10/arm/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) @@ -22,6 +22,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/arm/gcc-sources.add b/contrib/crossrpms/rtems4.10/arm/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/arm/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/arm/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 e2ccffa900..54eaa7d8b9 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-arm-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-arm-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-arm-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-arm-rtems4.10-binutils Requires: rtems-4.10-arm-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for arm-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-arm-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for arm-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for arm-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec index acfc61b455..421e6ca09b 100644 --- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec @@ -52,18 +52,30 @@ Name: rtems-4.10-arm-rtems4.10-gdb Summary: Gdb for target arm-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -71,34 +83,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -140,16 +131,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/arm-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -179,20 +163,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -243,6 +231,7 @@ GNU gdb targetting arm-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/arm-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/avr/Makefile.am b/contrib/crossrpms/rtems4.10/avr/Makefile.am index 2f159329a8..1e46c34d33 100644 --- a/contrib/crossrpms/rtems4.10/avr/Makefile.am +++ b/contrib/crossrpms/rtems4.10/avr/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/avr/gcc-sources.add b/contrib/crossrpms/rtems4.10/avr/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/avr/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/avr/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 513c43ff73..e2dd1e6c43 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-avr-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-avr-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-avr-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-avr-rtems4.10-binutils Requires: rtems-4.10-avr-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,13 +255,9 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} @@ -350,7 +344,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -622,7 +616,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}-25%{?dist} +# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -640,7 +634,7 @@ Summary: libgcc for avr-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-avr-rtems4.10-gcc-libgcc @@ -755,7 +749,7 @@ Summary: C Library (newlib) for avr-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -776,7 +770,7 @@ Newlib C Library for avr-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec index f9b7a33591..b5264d6b0d 100644 --- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec @@ -52,18 +52,30 @@ Name: rtems-4.10-avr-rtems4.10-gdb Summary: Gdb for target avr-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -71,34 +83,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -140,16 +131,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/avr-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -179,20 +163,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libavr-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/avr-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -243,6 +231,7 @@ GNU gdb targetting avr-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/avr-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/bfin/Makefile.am b/contrib/crossrpms/rtems4.10/bfin/Makefile.am index 25b48a22e5..94c8d29aaf 100644 --- a/contrib/crossrpms/rtems4.10/bfin/Makefile.am +++ b/contrib/crossrpms/rtems4.10/bfin/Makefile.am @@ -12,15 +12,15 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` include ../gcc.am GCC_OPTS += --languages=cxx -GDB_VERS = 6.5 +GDB_VERS = 7.3.1 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 12 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += --disable-infos diff --git a/contrib/crossrpms/rtems4.10/bfin/gcc-sources.add b/contrib/crossrpms/rtems4.10/bfin/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/bfin/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/bfin/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} diff --git a/contrib/crossrpms/rtems4.10/bfin/gdb-sources.add b/contrib/crossrpms/rtems4.10/bfin/gdb-sources.add index 79f6651c12..c309de489c 100644 --- a/contrib/crossrpms/rtems4.10/bfin/gdb-sources.add +++ b/contrib/crossrpms/rtems4.10/bfin/gdb-sources.add @@ -1,3 +1,13 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.5-bfinrtems-20090122.diff +BuildRequires: @rpmprefix@bfin-rtems4.10-binutils +BuildRequires: texinfo + +# The bfin simulator silently tries to conditionally build an SDL based GUI, +# but fails to link correctly +# Force not building the GUI. +%{!?suse:BuildConflicts: SDL-devel} +%{?suse:BuildConflicts: libSDL-devel} + +%if "%{gdb_version}" == "7.3.1" +Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2 +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-7.3.1-rtems4.10-20110919.diff +%endif 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 b0ef184eeb..08d003cb0d 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-bfin-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-bfin-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-bfin-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-bfin-rtems4.10-binutils Requires: rtems-4.10-bfin-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for bfin-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-bfin-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for bfin-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for bfin-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec index 197dad3f76..83d37da7e8 100644 --- a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec @@ -45,24 +45,37 @@ %define _host_rpmprefix %{nil} %endif -%define gdb_version 6.5 -%define gdb_rpmvers %{expand:%(echo 6.5 | tr - _)} +%define gdb_version 7.3.1 +%define gdb_rpmvers %{expand:%(echo 7.3.1 | tr - _)} Name: rtems-4.10-bfin-rtems4.10-gdb Summary: Gdb for target bfin-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 12%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -70,34 +83,23 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - +BuildRequires: rtems-4.10-bfin-rtems4.10-binutils +BuildRequires: texinfo +# The bfin simulator silently tries to conditionally build an SDL based GUI, +# but fails to link correctly +# Force not building the GUI. +%{!?suse:BuildConflicts: SDL-devel} +%{?suse:BuildConflicts: libSDL-devel} -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-6.5-bfinrtems-20090122.diff +%if "%{gdb_version}" == "7.3.1" +Source0: ftp://ftp.gnu.org/gnu/gdb/gdb-7.3.1.tar.bz2 +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gdb-7.3.1-rtems4.10-20110919.diff +%endif %description GDB for target bfin-rtems4.10 @@ -128,16 +130,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/bfin-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -161,20 +156,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libbfin-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/bfin-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -225,6 +224,7 @@ GNU gdb targetting bfin-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/bfin-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/h8300/Makefile.am b/contrib/crossrpms/rtems4.10/h8300/Makefile.am index c2bb89b995..9b4a0823c4 100644 --- a/contrib/crossrpms/rtems4.10/h8300/Makefile.am +++ b/contrib/crossrpms/rtems4.10/h8300/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/h8300/gcc-sources.add b/contrib/crossrpms/rtems4.10/h8300/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/h8300/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/h8300/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 63bdbab0a5..4a9a635487 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-h8300-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-h8300-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-h8300-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-h8300-rtems4.10-binutils Requires: rtems-4.10-h8300-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for h8300-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-h8300-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for h8300-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for h8300-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec index 0510a37a86..6a6d8425cd 100644 --- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec @@ -52,22 +52,34 @@ Name: rtems-4.10-h8300-rtems4.10-gdb Summary: Gdb for target h8300-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace %ifos mingw mingw32 # Mingw lacks functions required by the h8300 simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -75,34 +87,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -144,16 +135,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/h8300-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -183,20 +167,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libh8300-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/h8300-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -247,6 +235,7 @@ GNU gdb targetting h8300-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/h8300-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/i386/Makefile.am b/contrib/crossrpms/rtems4.10/i386/Makefile.am index b4978d0b10..e4e6f85983 100644 --- a/contrib/crossrpms/rtems4.10/i386/Makefile.am +++ b/contrib/crossrpms/rtems4.10/i386/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/i386/gcc-sources.add b/contrib/crossrpms/rtems4.10/i386/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/i386/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/i386/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 6fb8f6696d..bb44e4b328 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-i386-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-i386-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-i386-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-i386-rtems4.10-binutils Requires: rtems-4.10-i386-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for i386-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-i386-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for i386-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for i386-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec index 2c9afea19b..e8c9584c63 100644 --- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec @@ -52,18 +52,30 @@ Name: rtems-4.10-i386-rtems4.10-gdb Summary: Gdb for target i386-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -71,34 +83,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -140,16 +131,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/i386-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -179,20 +163,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libi386-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/i386-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -243,6 +231,7 @@ GNU gdb targetting i386-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/i386-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/lm32/Makefile.am b/contrib/crossrpms/rtems4.10/lm32/Makefile.am index b95ff39abc..4f1f477d06 100644 --- a/contrib/crossrpms/rtems4.10/lm32/Makefile.am +++ b/contrib/crossrpms/rtems4.10/lm32/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/lm32/gcc-sources.add b/contrib/crossrpms/rtems4.10/lm32/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/lm32/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/lm32/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 583551f23a..d4799848e4 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-lm32-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-lm32-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-lm32-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-lm32-rtems4.10-binutils Requires: rtems-4.10-lm32-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for lm32-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-lm32-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for lm32-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for lm32-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec index 090bbf58b8..f9ac6c0479 100644 --- a/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec @@ -52,22 +52,34 @@ Name: rtems-4.10-lm32-rtems4.10-gdb Summary: Gdb for target lm32-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace %ifos mingw mingw32 # Mingw lacks functions required by the lm32 simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -75,34 +87,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -144,16 +135,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/lm32-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -183,20 +167,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/liblm32-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/lm32-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -247,6 +235,7 @@ GNU gdb targetting lm32-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/lm32-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/m32c/Makefile.am b/contrib/crossrpms/rtems4.10/m32c/Makefile.am index 9b13cc93c4..a081892153 100644 --- a/contrib/crossrpms/rtems4.10/m32c/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m32c/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/m32c/gcc-sources.add b/contrib/crossrpms/rtems4.10/m32c/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/m32c/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/m32c/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 5ae7a36e75..f583ce0187 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-m32c-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m32c-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-m32c-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-m32c-rtems4.10-binutils Requires: rtems-4.10-m32c-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,13 +255,9 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} @@ -350,7 +344,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -622,7 +616,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}-25%{?dist} +# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -640,7 +634,7 @@ Summary: libgcc for m32c-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-m32c-rtems4.10-gcc-libgcc @@ -756,7 +750,7 @@ Summary: C Library (newlib) for m32c-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -777,7 +771,7 @@ Newlib C Library for m32c-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec index d518c8fc29..47d6a136c9 100644 --- a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec @@ -52,22 +52,34 @@ Name: rtems-4.10-m32c-rtems4.10-gdb Summary: Gdb for target m32c-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace %ifos mingw mingw32 # Mingw lacks functions required by the m32c simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -75,34 +87,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -144,16 +135,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/m32c-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -183,20 +167,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm32c-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m32c-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -247,6 +235,7 @@ GNU gdb targetting m32c-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/m32c-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/m32r/Makefile.am b/contrib/crossrpms/rtems4.10/m32r/Makefile.am index d8f676526f..238ece6b1d 100644 --- a/contrib/crossrpms/rtems4.10/m32r/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m32r/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/m32r/gcc-sources.add b/contrib/crossrpms/rtems4.10/m32r/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/m32r/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/m32r/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 6b594bdace..a2395b7f76 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-m32r-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m32r-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-m32r-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-m32r-rtems4.10-binutils Requires: rtems-4.10-m32r-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,13 +255,9 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} @@ -350,7 +344,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -622,7 +616,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}-25%{?dist} +# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -640,7 +634,7 @@ Summary: libgcc for m32r-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-m32r-rtems4.10-gcc-libgcc @@ -756,7 +750,7 @@ Summary: C Library (newlib) for m32r-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -777,7 +771,7 @@ Newlib C Library for m32r-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec index 8396af614e..321356912a 100644 --- a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec @@ -52,18 +52,30 @@ Name: rtems-4.10-m32r-rtems4.10-gdb Summary: Gdb for target m32r-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -71,34 +83,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -140,16 +131,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/m32r-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -179,20 +163,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm32r-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m32r-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -243,6 +231,7 @@ GNU gdb targetting m32r-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/m32r-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/m68k/Makefile.am b/contrib/crossrpms/rtems4.10/m68k/Makefile.am index 7c06a1570a..cac44007ea 100644 --- a/contrib/crossrpms/rtems4.10/m68k/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m68k/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/m68k/gcc-sources.add b/contrib/crossrpms/rtems4.10/m68k/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/m68k/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/m68k/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 d851bce555..1673a8c09a 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-m68k-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-m68k-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-m68k-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-m68k-rtems4.10-binutils Requires: rtems-4.10-m68k-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for m68k-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-m68k-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for m68k-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for m68k-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec index 529cc8229a..2708f303f6 100644 --- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec @@ -52,18 +52,30 @@ Name: rtems-4.10-m68k-rtems4.10-gdb Summary: Gdb for target m68k-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -71,34 +83,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -140,16 +131,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/m68k-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -179,20 +163,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm68k-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/m68k-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -243,6 +231,7 @@ GNU gdb targetting m68k-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/m68k-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/mips/Makefile.am b/contrib/crossrpms/rtems4.10/mips/Makefile.am index 7f54f24471..41e2db7d98 100644 --- a/contrib/crossrpms/rtems4.10/mips/Makefile.am +++ b/contrib/crossrpms/rtems4.10/mips/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/mips/gcc-sources.add b/contrib/crossrpms/rtems4.10/mips/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/mips/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/mips/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 1b34661ac0..437d1373d8 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-mips-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-mips-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-mips-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-mips-rtems4.10-binutils Requires: rtems-4.10-mips-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for mips-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-mips-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for mips-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for mips-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec index 841f60a3f4..caa2ac35d6 100644 --- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec @@ -52,18 +52,30 @@ Name: rtems-4.10-mips-rtems4.10-gdb Summary: Gdb for target mips-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -71,34 +83,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -140,16 +131,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/mips-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -179,20 +163,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmips-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mips-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -243,6 +231,7 @@ GNU gdb targetting mips-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/mips-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am b/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am index 2afe5638b2..ec9cbd1706 100644 --- a/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am +++ b/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am @@ -7,6 +7,6 @@ include $(top_srcdir)/mkspec.am # We only want a gdb with a tx39 simulator in it. We share the other tools GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec index be26d60a71..3d9df4fb26 100644 --- a/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec @@ -52,22 +52,34 @@ Name: rtems-4.10-mipstx39-rtems4.10-gdb Summary: Gdb for target mipstx39-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace %ifos mingw mingw32 # Mingw lacks functions required by the mipstx39 simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -75,34 +87,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -144,16 +135,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/mipstx39-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -183,20 +167,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmipstx39-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mipstx39-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -247,6 +235,7 @@ GNU gdb targetting mipstx39-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/mipstx39-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am index 35143ded9c..6303913926 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am +++ b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/powerpc/gcc-sources.add b/contrib/crossrpms/rtems4.10/powerpc/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/powerpc/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 4e89e21dad..dbf17387ac 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-powerpc-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-powerpc-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-powerpc-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-powerpc-rtems4.10-binutils Requires: rtems-4.10-powerpc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for powerpc-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for powerpc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec index a89978fd0a..5f8f40b60e 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec @@ -52,23 +52,35 @@ Name: rtems-4.10-powerpc-rtems4.10-gdb Summary: Gdb for target powerpc-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim + +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} %if "%{_build}" != "%{_host}" # psim doesn't support Cdn-X -%define build_sim --disable-sim +%global build_sim --disable-sim %else -%define build_sim --enable-sim --enable-sim-trace +%global build_sim --enable-sim --enable-sim-trace %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -76,34 +88,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -145,16 +136,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/powerpc-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -184,20 +168,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpowerpc-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/powerpc-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -248,6 +236,7 @@ GNU gdb targetting powerpc-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/powerpc-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/sh/Makefile.am b/contrib/crossrpms/rtems4.10/sh/Makefile.am index 3da1ee0b67..c8026c2334 100644 --- a/contrib/crossrpms/rtems4.10/sh/Makefile.am +++ b/contrib/crossrpms/rtems4.10/sh/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/sh/gcc-sources.add b/contrib/crossrpms/rtems4.10/sh/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/sh/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/sh/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 c0b1526748..3a887c1fa5 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-sh-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-sh-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-sh-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-sh-rtems4.10-binutils Requires: rtems-4.10-sh-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for sh-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-sh-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for sh-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for sh-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec index 4a013c986e..ee7a66162f 100644 --- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec @@ -52,18 +52,30 @@ Name: rtems-4.10-sh-rtems4.10-gdb Summary: Gdb for target sh-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -71,34 +83,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -140,16 +131,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/sh-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -179,20 +163,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsh-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/sh-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -243,6 +231,7 @@ GNU gdb targetting sh-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/sh-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 diff --git a/contrib/crossrpms/rtems4.10/sparc/Makefile.am b/contrib/crossrpms/rtems4.10/sparc/Makefile.am index ac5c551ee0..4f3360a6fd 100644 --- a/contrib/crossrpms/rtems4.10/sparc/Makefile.am +++ b/contrib/crossrpms/rtems4.10/sparc/Makefile.am @@ -12,7 +12,7 @@ BINUTILS_OPTS += GCC_VERS = 4.4.6 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 2 +GCC_RPMREL = 4 NEWLIB_VERS = 1.18.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 23` @@ -21,6 +21,6 @@ GCC_OPTS += --languages=cxx GDB_VERS = 7.2 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 1 +GDB_RPMREL = 2 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add b/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add index 66cfc3e805..3ec3b39505 100644 --- a/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add +++ b/contrib/crossrpms/rtems4.10/sparc/gcc-sources.add @@ -1,19 +1,13 @@ -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} %if %build_cxx -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} 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 276f3bb4df..4ac8621981 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: 2%{?dist} +Release: 4%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -107,12 +107,6 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.3.1 %endif -%if 0%{?fc13} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - %if 0%{?el6} %global mpc_provided %{nil} %global mpfr_provided 2.4.1 @@ -125,6 +119,12 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.1.4 %endif +%if 0%{?suse12_1} +%global mpc_provided 0.8.2 +%global mpfr_provided 3.0.1 +%global gmp_provided 5.0.2 +%endif + %if 0%{?suse11_3} %global mpc_provided 0.8.1 %global mpfr_provided 2.4.2 @@ -209,7 +209,6 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %if %{defined cloog_required} -%{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} @@ -234,10 +233,9 @@ BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} BuildRequires: rtems-4.10-sparc-rtems4.10-gcc = %{gcc_rpmvers} %endif -%if "%{gcc_version}" >= "4.2.0" +# Not strictly required, but patches may introduce a need to use them. +# For reasons of simplicity, always require them. BuildRequires: flex bison -%endif - BuildRequires: texinfo >= 4.2 BuildRequires: rtems-4.10-sparc-rtems4.10-binutils @@ -245,7 +243,7 @@ BuildRequires: rtems-4.10-sparc-rtems4.10-binutils Requires: rtems-4.10-gcc-common Requires: rtems-4.10-sparc-rtems4.10-binutils Requires: rtems-4.10-sparc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-27%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -257,21 +255,15 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib -%if "%{gcc_version}" == "4.4.5" -Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.5-rtems4.10-20110301.diff -%endif %if "%{gcc_version}" == "4.4.6" Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110420.diff +Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 0} -%if "%{gcc_version}" == "4.4.5" -Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif %if "%{gcc_version}" == "4.4.6" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Patch1: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-g++-4.4.6-rtems4.10-20110829.diff %endif %{?_without_sources:NoSource: 1} @@ -362,7 +354,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-27%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -635,7 +627,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}-25%{?dist} +# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-27%{?dist} # License: GPL # %if %build_infos @@ -653,7 +645,7 @@ Summary: libgcc for sparc-rtems4.10-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-25%{?dist} +Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-27%{?dist} License: GPL %description -n rtems-4.10-sparc-rtems4.10-gcc-libgcc @@ -829,7 +821,7 @@ Summary: C Library (newlib) for sparc-rtems4.10 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.10-newlib-common @@ -850,7 +842,7 @@ Newlib C Library for sparc-rtems4.10. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 25%{?dist} +Release: 27%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec index 4e16ee826b..05a2e1dcf5 100644 --- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec +++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec @@ -52,22 +52,34 @@ Name: rtems-4.10-sparc-rtems4.10-gdb Summary: Gdb for target sparc-rtems4.10 Group: Development/Tools Version: %{gdb_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_host_rpmprefix}gcc -%define build_sim --enable-sim +%global build_sim --enable-sim -%define build_sim --enable-sim --enable-sim-trace +# Whether to build against system readline +# Default: yes +%bcond_without system_readline + +# Whether to build python support +%if "%{_build}" != "%{_host}" +# Can't build python Cdn-X +%bcond_with python +%else +%bcond_without python +%endif +%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} + +%global build_sim --enable-sim --enable-sim-trace %ifos mingw mingw32 # Mingw lacks functions required by the sparc simulator %define build_sim --disable-sim %endif -%if "%{gdb_version}" >= "6.6" # suse %if "%{?suse}" >= "10.3" BuildRequires: libexpat-devel @@ -75,34 +87,13 @@ BuildRequires: libexpat-devel # Fedora/CentOS/Cygwin/MinGW BuildRequires: %{_host_rpmprefix}expat-devel %endif -%endif -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif %{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} BuildRequires: %{_host_rpmprefix}ncurses-devel -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 - - Requires: rtems-4.10-gdb-common %if "%{gdb_version}" == "7.2" @@ -144,16 +135,9 @@ cd .. --disable-werror \ %{build_sim} \ %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif + %{?with_python:--with-python}%{!?with_python:--without-python} \ + --with-gdb-datadir=%{_datadir}/sparc-rtems4.10-gdb \ --prefix=%{_prefix} --bindir=%{_bindir} \ --includedir=%{_includedir} --libdir=%{_libdir} \ --mandir=%{_mandir} --infodir=%{_infodir} @@ -183,20 +167,24 @@ cd .. # host library, installed to a bogus directory rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsparc-rtems4.10-sim.a -%if "%{gdb_version}" >= "7.0" # Bug in gdb-7.0, bogusly installs linux-only files somethinguseful=0 - for f in ${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls/*.xml; do + for f in ${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.10-gdb/syscalls/*.xml; do case $f in *linux.xml) rm -f $f;; *.xml) somethinguseful=1;; esac done if test $somethinguseful -eq 0; then - rm -rf "${RPM_BUILD_ROOT}%{_datadir}/gdb/syscalls" + rm -rf "${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.10-gdb/syscalls" fi -%endif +%if "{gdb_version}" >= "7.3" +%if ! %{with python} +# gdb-7.3 doesn't honor --without-python correctly + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/sparc-rtems4.10-gdb/python +%endif +%endif cd .. # Extract %%__os_install_post into os_install_post~ @@ -247,6 +235,7 @@ GNU gdb targetting sparc-rtems4.10. %defattr(-,root,root) %dir %{_prefix} %dir %{_prefix}/share +%{?with_python:%{_datadir}/sparc-rtems4.10-gdb} %dir %{_mandir} %dir %{_mandir}/man1 |