diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-08-26 16:44:54 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-08-26 16:44:54 +0000 |
| commit | 246717fa0f5ae14f856fe17c49f5e33a15848ee9 (patch) | |
| tree | a838e18bbd95b55ef59511d87ba384f05550a61c /contrib | |
| parent | Remove. (diff) | |
| download | rtems-246717fa0f5ae14f856fe17c49f5e33a15848ee9.tar.bz2 | |
Replace build_f95 with build_fortran.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/gcc/base-gfortran.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/build.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/install.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/prep.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/target-gfortran.add | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add index e0bb76771b..3cf3359a15 100644 --- a/contrib/crossrpms/gcc/base-gfortran.add +++ b/contrib/crossrpms/gcc/base-gfortran.add @@ -1,5 +1,5 @@ %if %build_infos -%if %build_f95 +%if %build_fortran # ============================================================== # @rpmprefix@gcc-gfortran-common # ============================================================== diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index 3dbd9b39b0..6cf146e056 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -10,7 +10,7 @@ %if %build_g77 languages="$languages,g77" %endif -%if %build_f95 +%if %build_fortran languages="$languages,f95" %endif %if %build_gcj diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 431f231e6e..2e378514e3 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -26,7 +26,7 @@ BuildRequires: %{_host_rpmprefix}gcc %define _gmp_minvers 4.1 %else %if "%{gcc_version}" >= "4.2.0" -%if %build_f95 +%if %build_fortran %define _gmp_minvers 4.1 %endif %endif @@ -49,7 +49,7 @@ BuildRequires: %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers} %define mpfr_version 2.3.2 %else %if "%{gcc_version}" >= "4.2.0" -%if %build_f95 +%if %build_fortran %define _mpfr_minvers 2.2.1 %define mpfr_version 2.3.2 %endif diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 09c8063fa4..74196a080a 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -46,7 +46,7 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/man7 %endif -%if %build_f95 +%if %build_fortran # # Bug in gcc-4.0.0pre # mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/@tool_target@-gfortran %endif diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add index 4413603897..a3adba1a09 100644 --- a/contrib/crossrpms/gcc/prep.add +++ b/contrib/crossrpms/gcc/prep.add @@ -9,7 +9,7 @@ %{?PATCH1:%patch1 -p0} %endif -%if %build_f95 +%if %build_fortran %setup -q -T -D -n %{name}-%{version} -a2 %{?PATCH2:%patch2 -p0} %endif diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add index d0c71f973f..dc397eaa84 100644 --- a/contrib/crossrpms/gcc/target-gfortran.add +++ b/contrib/crossrpms/gcc/target-gfortran.add @@ -1,4 +1,4 @@ -%if %build_f95 +%if %build_fortran # ============================================================== # @rpmprefix@@tool_target@-gcc-gfortran # ============================================================== |