2003-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* binutils/base-binutils.add: Add osversion support.
	* binutils/binutils.add: Add osversion support.
	%setup -n %{name}-%{version}.
	Don't remove c++filt.
	* binutils/target-binutils.add: Add osversion support.
	Pickup c++filt.
	* gcc3newlib/base-g77.add: Add osversion support.
	* gcc3newlib/base-gcc.add: Add osversion support.
	* gcc3newlib/base-gcj.add: Add osversion support.
	* gcc3newlib/base-gnat.add: Add osversion support.
	* gcc3newlib/gccnewlib.add: Add osversion support.
	Remove c++filt,
	%setup -n -n %{name}-%{version}.
	* gcc3newlib/target-c++.add: Add osversion support.
	Don't pickup c++filt.
	* gcc3newlib/target-g77.add: Add osversion support.
	* gcc3newlib/target-gcc.add: Add osversion support.
	* gcc3newlib/target-gcj.add: Add osversion support.
	* gcc3newlib/target-gnat.add: Add osversion support.
	* gccnewlib/gccnewlib.add: %setup -n %{name}-%{version}.
	* gdb/base-gdb.add: Add osversion support, rpmgroup, rpmprefix,
	gdb_version, gdb_target.
	* gdb/target-gdb.add: Ditto.
	* gdb/gdb.add: Ditto.
	%setup -n -n %{name}-%{version}.
This commit is contained in:
Ralf Corsepius
2003-09-04 14:39:05 +00:00
parent dbb13bf6b7
commit cdf5ff651b
18 changed files with 125 additions and 102 deletions

View File

@@ -1,18 +1,18 @@
# ==============================================================
# rtems-base-binutils
# ==============================================================
%package -n %{rpmprefix}rtems-base-binutils
%package -n %{rpmprefix}rtems@osversion@-base-binutils
Summary: base package for rtems binutils
Group: %{rpmgroup}
PreReq: /sbin/install-info
%description -n %{rpmprefix}rtems-base-binutils
%description -n %{rpmprefix}rtems@osversion@-base-binutils
RTEMS is an open source operating system for embedded systems.
This is the base for binutils regardless of target CPU.
%post -n %{rpmprefix}rtems-base-binutils
%post -n %{rpmprefix}rtems@osversion@-base-binutils
if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
then
rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -22,7 +22,7 @@ This is the base for binutils regardless of target CPU.
done
fi
%postun -n %{rpmprefix}rtems-base-binutils
%postun -n %{rpmprefix}rtems@osversion@-base-binutils
if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
then
rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -32,7 +32,7 @@ This is the base for binutils regardless of target CPU.
done
fi
%files -n %{rpmprefix}rtems-base-binutils -f files
%files -n %{rpmprefix}rtems@osversion@-base-binutils -f files
%defattr(-,root,root)
%dir %{_prefix}/info
%doc %{_prefix}/info/dir

View File

@@ -38,8 +38,7 @@ RTEMS is an open source operating system for embedded systems.
This is binutils sources with patches for RTEMS.
%prep
# untar the sources inside %{binutils_target}-binutils
%setup -c -n %{binutils_target}-binutils
%setup -c -n %{name}-%{version}
@PATCH2@
test -d build || mkdir build
@@ -63,7 +62,7 @@ This is binutils sources with patches for RTEMS.
../binutils-%{binutils_version}/mkinstalldirs \
$RPM_BUILD_ROOT%{_prefix}/share/locale
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
# rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
# gzip info files
gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info-* 2>/dev/null

View File

@@ -4,7 +4,7 @@
%package -n %{rpmprefix}%{binutils_target}-binutils
Summary: rtems binutils for %{binutils_target}
Group: %{rpmgroup}
Requires: %{rpmprefix}rtems-base-binutils
Requires: %{rpmprefix}rtems@osversion@-base-binutils
Autoreqprov: off
%description -n %{rpmprefix}%{binutils_target}-binutils
@@ -21,10 +21,11 @@ This is the GNU binutils for RTEMS targetting %{binutils_target}.
%{_prefix}/bin/%{binutils_target}-addr2line%{_exeext}
%{_prefix}/bin/%{binutils_target}-ar%{_exeext}
%{_prefix}/bin/%{binutils_target}-as%{_exeext}
# c++filt now comes from gcc
# %{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
%if "%{binutils_version}" < "2.13"
# deleted as of 2.13
# %{_prefix}/bin/%{binutils_target}-gasp%{_exeext}
%{_prefix}/bin/%{binutils_target}-gasp%{_exeext}
%endif
%{_prefix}/bin/%{binutils_target}-ld%{_exeext}
%{_prefix}/bin/%{binutils_target}-nm%{_exeext}
%{_prefix}/bin/%{binutils_target}-objcopy%{_exeext}