diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-04-24 05:57:58 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-04-24 05:57:58 +0000 |
| commit | 461e171b9904f4270dd24f520eb6ddda1f0fdc0b (patch) | |
| tree | 9cbde738aaac42136c5b2fd6ba6440eb52b65dd1 /contrib | |
| parent | 2010-04-23 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-461e171b9904f4270dd24f520eb6ddda1f0fdc0b.tar.bz2 | |
Fix typo in comment.
Use %{el6} to identify building for CentOS6/RHEL6.
Reflect several packages are missing from RHEL6 Beta.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 64c9abb962..1d93af441b 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -25,7 +25,7 @@ BuildRequires: %{_host_rpmprefix}gcc # FIXME: Disable lto for now, to avoid dependencies on libelf %bcond_with lto -# FIXME: Disamble python gdb scripts +# FIXME: Disable python gdb scripts # ATM, no idea how to package them %bcond_with pygdb @@ -58,13 +58,14 @@ BuildRequires: %{_host_rpmprefix}gcc %global gmp_provided 4.2.4 %endif -%if 0%{?rhel6} +%if 0%{?el6} %global mpc_provided %{nil} -%global mpfr_provided 2.4.1 +# el6 beta ships mpfr but mpfr-devel is missing +%global mpfr_provided %{nil} %global gmp_provided 4.3.1 %endif -%if 0%{?rhel5} +%if 0%{?el5} %global mpc_provided %{nil} %global mpfr_provided %{nil} %global gmp_provided 4.1.4 @@ -166,7 +167,7 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} %{?fc11:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc12:BuildRequires: cloog-ppl-devel >= %cloog_required} %{?fc13:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?rhel6:BuildRequires: cloog-ppl-devel >= %cloog_required} +# el6 ships cloog-ppl, but cloog-ppl-devel is missing %{?suse11_2:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %{?suse11_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} %endif |