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}. 2003-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * binutils/Makefile.am: Fix osversion support for sh-rtemself. * gcc3newlib/Makefile.am: Fix osversion support for sh-rtemself. 2003-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Add --enable-osversions (OS-versioned RPMS support). * binutils/Makefile.am: Add osversion support. * binutils/mkspec.in: Add osversion support. * gcc3newlib/Makefile.am: Add osversion support. * gcc3newlib/mkspec.in: Add osversion support. * gdb/Makefile.am: Add osversion support. * gdb/mkspec.in: Add osversion support. Add rpmprefix, rpmgroup.
2003-09-05 03:23:17 +00:00
parent 6ff0190977
commit 792f23905c
25 changed files with 279 additions and 225 deletions
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -23,73 +23,73 @@ MKGDBSPEC_DEPS = mkspec gdb.spec.in \

 RPM_SPECS_DATA = 

-arm-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@
-RPM_SPECS_DATA += arm-rtems-$(GDBVERS).spec
+arm-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@
+RPM_SPECS_DATA += arm-rtems@osversion@-$(GDBVERS).spec

 # does not build with 5.2
-# c4x-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-# 	$(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@
-# RPM_SPECS_DATA += c4x-rtems-$(GDBVERS).spec
+# c4x-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+# 	$(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems@osversion@ > $@
+# RPM_SPECS_DATA += c4x-rtems@osversion@-$(GDBVERS).spec

-h8300-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@
-RPM_SPECS_DATA += h8300-rtems-$(GDBVERS).spec
+h8300-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems@osversion@ > $@
+RPM_SPECS_DATA += h8300-rtems@osversion@-$(GDBVERS).spec

 # does not build with 5.2
-# hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-# 	$(MKSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@
-# RPM_SPECS_DATA += hppa1.1-rtems-$(GDBVERS).spec
+# hppa1.1-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+# 	$(MKSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems@osversion@ > $@
+# RPM_SPECS_DATA += hppa1.1-rtems@osversion@-$(GDBVERS).spec

-RPM_SPECS_DATA += i386-rtems-$(GDBVERS).spec
-i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@
+RPM_SPECS_DATA += i386-rtems@osversion@-$(GDBVERS).spec
+i386-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache i386-rtems@osversion@ > $@

 # does not build with 5.2
 # i386-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 # 	$(MKSPEC) -cfg $(top_builddir)/setup.cache i386-RTEMS > $@
 # RPM_SPECS_DATA += i386-RTEMS-$(GDBVERS).spec

-i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@
-RPM_SPECS_DATA += i960-rtems-$(GDBVERS).spec
+i960-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache i960-rtems@osversion@ > $@
+RPM_SPECS_DATA += i960-rtems@osversion@-$(GDBVERS).spec

-m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@
-RPM_SPECS_DATA += m68k-rtems-$(GDBVERS).spec
+m68k-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems@osversion@ > $@
+RPM_SPECS_DATA += m68k-rtems@osversion@-$(GDBVERS).spec

-mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@
-RPM_SPECS_DATA += mips64orion-rtems-$(GDBVERS).spec
+mips64orion-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems@osversion@ > $@
+RPM_SPECS_DATA += mips64orion-rtems@osversion@-$(GDBVERS).spec

-mips-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@
-RPM_SPECS_DATA += mips-rtems-$(GDBVERS).spec
+mips-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache mips-rtems@osversion@ > $@
+RPM_SPECS_DATA += mips-rtems@osversion@-$(GDBVERS).spec

-mipstx39-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache mipstx39-rtems > $@
-RPM_SPECS_DATA += mipstx39-rtems-$(GDBVERS).spec
+mipstx39-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache mipstx39-rtems@osversion@ > $@
+RPM_SPECS_DATA += mipstx39-rtems@osversion@-$(GDBVERS).spec

 # does not build with 5.2
 # powerpc-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
 # 	$(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-RTEMS > $@
 # RPM_SPECS_DATA += powerpc-RTEMS-$(GDBVERS).spec

-powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@
-RPM_SPECS_DATA += powerpc-rtems-$(GDBVERS).spec
+powerpc-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems@osversion@ > $@
+RPM_SPECS_DATA += powerpc-rtems@osversion@-$(GDBVERS).spec

-sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@
-RPM_SPECS_DATA += sh-rtems-$(GDBVERS).spec
+sh-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtems@osversion@ > $@
+RPM_SPECS_DATA += sh-rtems@osversion@-$(GDBVERS).spec

-sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@
-RPM_SPECS_DATA += sh-rtemself-$(GDBVERS).spec
+sh-rtemself@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself@osversion@ > $@
+RPM_SPECS_DATA += sh-rtemself@osversion@-$(GDBVERS).spec

-sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems > $@
-RPM_SPECS_DATA += sparc-rtems-$(GDBVERS).spec
+sparc-rtems@osversion@-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems@osversion@ > $@
+RPM_SPECS_DATA += sparc-rtems@osversion@-$(GDBVERS).spec

 CLEANFILES += $(RPM_SPECS_DATA)

--- a/scripts/gdb/base-gdb.add
+++ b/scripts/gdb/base-gdb.add
@@ -2,30 +2,29 @@
 # rtems-base-gdb
 # =====================================================================

-%package -n rtems-base-gdb
-Provides:	rtems-base-gdb
+%package -n %{rpmprefix}rtems@osversion@-base-gdb
 Summary:      base package for rtems gdb
-Group: rtems
+Group: %{rpmgroup}

-%description -n rtems-base-gdb
+%description -n %{rpmprefix}rtems@osversion@-base-gdb

 RTEMS is an open source operating system for embedded systems.

 This is the base for gdb regardless of target CPU.

-%files -n rtems-base-gdb
+%files -n %{rpmprefix}rtems@osversion@-base-gdb
 %defattr(-,root,root)

 %dir %{_prefix}/info
 %doc %{_prefix}/info/gdb.info*
 %doc %{_prefix}/info/mmalloc.info*
 # FIXME: When had gdbint and stabs been introduced?
-%if "@gdb_version@" >= "5.0"
+%if "%{gdb_version}" >= "5.0"
 %doc %{_prefix}/info/gdbint.info*
 %doc %{_prefix}/info/stabs.info*
 %endif
 # gdb 4.18 installed this, gdb 5.0 does not
-%if "@gdb_version@" < "5.0"
+%if "%{gdb_version}" < "5.0"
 %doc %{_prefix}/info/readline.info*
 %endif

@@ -43,7 +42,7 @@ This is the base for gdb regardless of target CPU.
 # We use libiberty from gcc
 # %{_prefix}/lib/libiberty*

-%post -n rtems-base-gdb
+%post -n %{rpmprefix}rtems@osversion@-base-gdb
  if test -d $RPM_INSTALL_PREFIX/rtems/info;
  then
    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
@@ -53,7 +52,7 @@ This is the base for gdb regardless of target CPU.
    done
  fi

-%postun -n rtems-base-gdb
+%postun -n %{rpmprefix}rtems@osversion@-base-gdb
  if test -d $RPM_INSTALL_PREFIX/rtems/info;
  then
    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
--- a/scripts/gdb/gdb.add
+++ b/scripts/gdb/gdb.add
@@ -1,17 +1,21 @@
-Name:         @target_alias@-gdb-collection
+
+%define gdb_version	@gdb_version@
+%define gdb_target	@target_alias@
+
+Name:         %{rpmprefix}%{gdb_target}-gdb-collection
 Release:      @Release@
 License:      GPL/LGPL
-Group:        rtems
+Group:        %{rpmgroup}

 Autoreqprov:  on
 Packager:     corsepiu@faw.uni-ulm.de and joel@OARcorp.com

-Version:      @gdb_version@
-Summary:      gdb for target @target_alias@
-Source0:      ftp://ftp.gnu.org/pub/gnu/gdb-@gdb_version@.tar.gz
-Patch0:	      gdb-@gdb_version@-rtems-base-@gdb_patch_version@.diff
-Patch1:	      gdb-@gdb_version@-rtems-cg-@gdb_patch_version@.diff
-Patch2:	      gdb-@gdb_version@-rtems-rdbg-@gdb_patch_version@.diff
+Version:      %{gdb_version}
+Summary:      gdb for target %{gdb_version}
+Source0:      ftp://ftp.gnu.org/pub/gnu/gdb-%{gdb_version}.tar.gz
+Patch0:	      gdb-%{gdb_version}-rtems-base-@gdb_patch_version@.diff
+Patch1:	      gdb-%{gdb_version}-rtems-cg-@gdb_patch_version@.diff
+Patch2:	      gdb-%{gdb_version}-rtems-rdbg-@gdb_patch_version@.diff

 %if "%{_vendor}" == "redhat"
 BuildPreReq:	ncurses-devel
@@ -34,10 +38,10 @@ NoSource:      0
 #  and targets which require extra arguments.
 %define _sim	1

-%if "@target_alias@" == "m68k-rtems"
+%if "%{gdb_target}" == "m68k-rtems@osversion@"
 %define _sim	0
 %endif
-%if "@target_alias@" == "i386-rtems"
+%if "%{gdb_target}" == "i386-rtems@osversion@"
 %define _sim	0
 %endif

@@ -45,13 +49,12 @@ NoSource:      0
 %description
 RTEMS is an open source operating system for embedded systems.

-This is the GNU gdb for RTEMS targetting @target_alias@.
+This is the GNU gdb for RTEMS targetting %{gdb_version}.

 %prep
-# untar the sources inside @target_alias@-gdb
-%setup -c -n @target_alias@-gdb -a 0
+%setup -c -n %{name}-%{version} -a 0

-cd gdb-@gdb_version@
+cd gdb-%{gdb_version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -61,7 +64,7 @@ cd gdb-@gdb_version@
 simargs="--enable-sim"
 %endif

-%if "@target_alias@" == "powerpc-rtems"
+%if "%{gdb_target}" == "powerpc-rtems@osversion@"
 simargs="$simargs --enable-sim-timebase --enable-sim-hardware"
 #  Enabling this causes the program image to be huge and causes
 #  some gcc/hosts combinations to run out of memory.
@@ -70,9 +73,10 @@ cd gdb-@gdb_version@

 test -d build || mkdir build
  cd build
-  ../gdb-@gdb_version@/configure \
+  export PATH="%{_bindir}:${PATH}"
+  ../gdb-%{gdb_version}/configure \
    --build=%_build --host=%_host \
-    --target=@target_alias@ \
+    --target=%{gdb_target} \
    --verbose --prefix=%{_prefix} $simargs \
    --disable-nls

--- a/scripts/gdb/mkspec.in
+++ b/scripts/gdb/mkspec.in
@@ -52,6 +52,9 @@ sed -e "s%@Release\@%${gdb_rpm_release}%g" \
    -e "s,@rpm_build_root\@,${rpm_build_root},g" \
    -e "s%@prefix\@%@prefix@%g" \
    -e "s%@target_alias\@%${target_alias}%g" \
+    -e "s,@rpmprefix\@,@rpmprefix@,g" \
+    -e "s%@rpmgroup\@%@rpmgroup@%g" \
+    -e "s%@osversion\@%@osversion@%g" \
    -e "s%@gdb_version\@%${gdb_version}%g" \
    -e "s%@gdb_patch_version\@%${gdb_patch_version}%g" \
    -e "s%@extra_configure_arguments\@%${extra_configure_arguments}%g" \
--- a/scripts/gdb/target-gdb.add
+++ b/scripts/gdb/target-gdb.add
@@ -1,31 +1,30 @@
 # =====================================================================
-# @target_alias@-gdb
+# %{gdb_target}-gdb
 # =====================================================================

-%package -n @target_alias@-gdb
-Provides:	@target_alias@-gdb
-Summary:      rtems gdb for @target_alias@
-Group: rtems
-Requires: rtems-base-gdb
+%package -n %{rpmprefix}%{gdb_target}-gdb
+Summary:      rtems gdb for %{gdb_target}
+Group: %{rpmgroup}
+Requires: %{rpmprefix}rtems@osversion@-base-gdb

-%description -n @target_alias@-gdb
+%description -n %{rpmprefix}%{gdb_target}-gdb

 RTEMS is an open source operating system for embedded systems.

-This is the GNU gdb for RTEMS targetting @target_alias@.
+This is the GNU gdb for RTEMS targetting %{gdb_target}.

-%files -n @target_alias@-gdb
-%defattr(-,attr,attr)
-%doc %{_prefix}/man/man1/@target_alias@-gdb.1*
+%files -n %{rpmprefix}%{gdb_target}-gdb
+%defattr(-,root,root)
+%doc %{_prefix}/man/man1/%{gdb_target}-gdb.1*
 %if "%_sim" == "1"
-%doc %{_prefix}/man/man1/@target_alias@-run.1*
+%doc %{_prefix}/man/man1/%{gdb_target}-run.1*
 %endif

 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-gdb%{_exeext}
+%{_prefix}/bin/%{gdb_target}-gdb%{_exeext}
 %if "%_sim" == "1"
-%{_prefix}/bin/@target_alias@-run%{_exeext}
+%{_prefix}/bin/%{gdb_target}-run%{_exeext}
 %endif
-%if "@target_alias@" == "sparc-rtems"
-%{_prefix}/bin/@target_alias@-sis%{_exeext}
+%if "%{gdb_target}" == "sparc-rtems@osversion@"
+%{_prefix}/bin/%{gdb_target}-sis%{_exeext}
 %endif