Changeset cdf5ff65 in rtems for scripts/binutils

Timestamp:

Sep 4, 2003, 2:39:05 PM (17 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

35e4691

Parents:

dbb13bf

Message:

2003-09-04 Ralf Corsepius <corsepiu@…>

• 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}.

Location:

scripts/binutils

Files:

• base-binutils.add (modified) (4 diffs)
• binutils.add (modified) (2 diffs)
• target-binutils.add (modified) (2 diffs)

scripts/binutils/base-binutils.add

@@ -2 +2 @@
 # 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.
@@ -13 +13 @@
 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
@@ -23 +23 @@
   fi
 
-%postun -n %{rpmprefix}rtems-base-binutils
+%postun -n %{rpmprefix}rtems@osversion@-base-binutils
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
@@ -33 +33 @@
   fi
 
-%files -n %{rpmprefix}rtems-base-binutils -f files
+%files -n %{rpmprefix}rtems@osversion@-base-binutils -f files
 %defattr(-,root,root)
 %dir %{_prefix}/info

scripts/binutils/binutils.add

@@ -39 +39 @@
 
 %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
@@ -64 +63 @@
     $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

scripts/binutils/target-binutils.add

@@ -5 +5 @@
 Summary:      rtems binutils for %{binutils_target}
 Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems-base-binutils
+Requires: %{rpmprefix}rtems@osversion@-base-binutils
 Autoreqprov:    off
 
@@ -22 +22 @@
 %{_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}