diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-07-23 14:21:26 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-07-23 14:21:26 +0000 |
| commit | 62553330b3b095a9060c672a13143b1aa0812446 (patch) | |
| tree | 1b5348e385ea0c25dbcbd102fa04177a7da88223 /contrib | |
| parent | Rename *base packages into gcc*-common gcc/base*.add (diff) | |
| download | rtems-62553330b3b095a9060c672a13143b1aa0812446.tar.bz2 | |
Rename *base packages into gcc*-common gcc/base*.add
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/target-newlib.add | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index ba8f2fbae9..dbb4abd98e 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -31,14 +31,13 @@ BuildRequires: @rpmprefix@@tool_target@-sys-root BuildRequires: @rpmprefix@@tool_target@-w32api-sys-root %if %build_infos -Requires: @rpmprefix@rtems4.7-base-gcc +Requires: @rpmprefix@gcc-common %endif Requires: @rpmprefix@@tool_target@-binutils Requires: @rpmprefix@@tool_target@-sys-root Requires: @rpmprefix@@tool_target@-w32api-sys-root Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release} -%if "%{_vendor}" == "redhat" %if %build_gcj BuildRequires: zlib-devel %endif @@ -51,7 +50,6 @@ BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-%{release} %if %build_f95 BuildRequires: gmp-devel %endif -%endif %if "%{gcc_version}" >= "3.4" %define gcclib %{_libdir}/gcc diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add index 6d5f3354d0..fc4fec232d 100644 --- a/contrib/crossrpms/gcc/target-newlib.add +++ b/contrib/crossrpms/gcc/target-newlib.add @@ -7,7 +7,13 @@ Summary: C Library (newlib) for @tool_target@ Group: Development/Tools License: Distributable Version: %{newlib_version} -Provides: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release} + +Provides: @rpmprefix@@tool_target@-libc = %{newlib_version}-%{release} +Obsoletes: @rpmprefix@@tool_target@-libc < %{newlib_version}-%{release} + +%if %build_infos +Requires: @rpmprefix@newlib-common +%endif %description -n @rpmprefix@@tool_target@-newlib Newlib C Library for @tool_target@. |