diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-04 13:35:27 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-04 13:35:27 +0000 |
commit | f8f365a6c9bd474457f9d7503fd0788abfb9a5c5 (patch) | |
tree | bbeef0b61ed02739a5cc01e73847fc27c24a957f /scripts | |
parent | 2003-09-04 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-f8f365a6c9bd474457f9d7503fd0788abfb9a5c5.tar.bz2 |
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.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/ChangeLog | 11 | ||||
-rw-r--r-- | scripts/binutils/Makefile.am | 80 | ||||
-rw-r--r-- | scripts/binutils/mkspec.in | 2 | ||||
-rw-r--r-- | scripts/configure.ac | 9 | ||||
-rw-r--r-- | scripts/gcc3newlib/Makefile.am | 74 | ||||
-rw-r--r-- | scripts/gcc3newlib/mkspec.in | 1 | ||||
-rw-r--r-- | scripts/gdb/Makefile.am | 84 | ||||
-rw-r--r-- | scripts/gdb/mkspec.in | 3 |
8 files changed, 145 insertions, 119 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 29292ac78d..090eb7e831 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,14 @@ +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-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am, configure.ac, diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am index 9953111019..b25a9a4431 100644 --- a/scripts/binutils/Makefile.am +++ b/scripts/binutils/Makefile.am @@ -19,61 +19,61 @@ RPM_SPECS_DATA = MKBINUTILSSPEC_DEPS = mkspec binutils.spec.in \ $(top_builddir)/setup.cache -arm-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@ -RPM_SPECS_DATA += arm-rtems-$(BINUTILSVERS).spec +arm-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@ +RPM_SPECS_DATA += arm-rtems@osversion@-$(BINUTILSVERS).spec -c4x-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@ -RPM_SPECS_DATA += c4x-rtems-$(BINUTILSVERS).spec +c4x-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems@osversion@ > $@ +RPM_SPECS_DATA += c4x-rtems@osversion@-$(BINUTILSVERS).spec -h8300-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@ -RPM_SPECS_DATA += h8300-rtems-$(BINUTILSVERS).spec +h8300-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems@osversion@ > $@ +RPM_SPECS_DATA += h8300-rtems@osversion@-$(BINUTILSVERS).spec -hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@ -RPM_SPECS_DATA += hppa1.1-rtems-$(BINUTILSVERS).spec +hppa1.1-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems@osversion@ > $@ +RPM_SPECS_DATA += hppa1.1-rtems@osversion@-$(BINUTILSVERS).spec -i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@ -RPM_SPECS_DATA += i386-rtems-$(BINUTILSVERS).spec +i386-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i386-rtems@osversion@ > $@ +RPM_SPECS_DATA += i386-rtems@osversion@-$(BINUTILSVERS).spec -i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@ -RPM_SPECS_DATA += i960-rtems-$(BINUTILSVERS).spec +i960-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache i960-rtems@osversion@ > $@ +RPM_SPECS_DATA += i960-rtems@osversion@-$(BINUTILSVERS).spec -m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@ -RPM_SPECS_DATA += m68k-rtems-$(BINUTILSVERS).spec +m68k-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems@osversion@ > $@ +RPM_SPECS_DATA += m68k-rtems@osversion@-$(BINUTILSVERS).spec -mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@ -RPM_SPECS_DATA += mips64orion-rtems-$(BINUTILSVERS).spec +mips64orion-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems@osversion@ > $@ +RPM_SPECS_DATA += mips64orion-rtems@osversion@-$(BINUTILSVERS).spec -mips-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@ -RPM_SPECS_DATA += mips-rtems-$(BINUTILSVERS).spec +mips-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache mips-rtems@osversion@ > $@ +RPM_SPECS_DATA += mips-rtems@osversion@-$(BINUTILSVERS).spec -or32-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache or32-rtems > $@ -RPM_SPECS_DATA += or32-rtems-$(BINUTILSVERS).spec +or32-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache or32-rtems@osversion@ > $@ +RPM_SPECS_DATA += or32-rtems@osversion@-$(BINUTILSVERS).spec -powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@ -RPM_SPECS_DATA += powerpc-rtems-$(BINUTILSVERS).spec +powerpc-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems@osversion@ > $@ +RPM_SPECS_DATA += powerpc-rtems@osversion@-$(BINUTILSVERS).spec -sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@ -RPM_SPECS_DATA += sh-rtems-$(BINUTILSVERS).spec +sh-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtems@osversion@ > $@ +RPM_SPECS_DATA += sh-rtems@osversion@-$(BINUTILSVERS).spec sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@ + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself@osversion@ > $@ RPM_SPECS_DATA += sh-rtemself-$(BINUTILSVERS).spec -sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems > $@ -RPM_SPECS_DATA += sparc-rtems-$(BINUTILSVERS).spec +sparc-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems@osversion@ > $@ +RPM_SPECS_DATA += sparc-rtems@osversion@-$(BINUTILSVERS).spec CLEANFILES += $(RPM_SPECS_DATA) diff --git a/scripts/binutils/mkspec.in b/scripts/binutils/mkspec.in index bbba80989b..ce19c4aa70 100644 --- a/scripts/binutils/mkspec.in +++ b/scripts/binutils/mkspec.in @@ -59,6 +59,8 @@ sed -e "s%@Release\@%${binutils_rpm_release}%g" \ -e "s%@prefix\@%@prefix@%g" \ -e "s,@rpmprefix\@,@rpmprefix@,g" \ -e "s%@rpmgroup\@%@rpmgroup@%g" \ + -e "s%@rpmgroup\@%@rpmgroup@%g" \ + -e "s%@osversion\@%@osversion@%g" \ -e "s%@binutils_version\@%${binutils_version}%g" \ -e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \ -e "s,@PATCH1\@,${PATCH1}," \ diff --git a/scripts/configure.ac b/scripts/configure.ac index 7ce93f907f..a328e6822d 100644 --- a/scripts/configure.ac +++ b/scripts/configure.ac @@ -23,6 +23,14 @@ no ) rpmprefix="%{nil}";; esac], [rpmprefix="rtems-"]RTEMS_API["-"]) +AC_ARG_ENABLE([osversions], +[ --enable-osversions whether to use version numbers in os-tripples], +[case $enable_osversions in +yes ) osversion=RTEMS_API;; +* ) osversion=;; +esac], +[osversion=]) + AC_MSG_CHECKING(for rpm SPECS directory) # Allow users to override RPM_SPECSdir from the environment. if test -z "$RPM_SPECSdir" ; @@ -79,6 +87,7 @@ AC_SUBST(BSPVERS) AC_SUBST(RPM_CPU) AC_SUBST(rpmprefix,$rpmprefix) AC_SUBST(rpmgroup,[Rtems/][RTEMS_API]) +AC_SUBST(osversion,$osversion) AC_CONFIG_FILES([Makefile binutils/Makefile diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am index b1e68cfe26..de26cf0048 100644 --- a/scripts/gcc3newlib/Makefile.am +++ b/scripts/gcc3newlib/Makefile.am @@ -28,57 +28,57 @@ MKGCCNEWLIBSPEC_DEPS = mkspec gccnewlib.spec.in \ RPM_SPECS_DATA = -arm-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@ -RPM_SPECS_DATA += arm-rtems-$(GCC3NEWLIBVERS).spec +arm-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems@osversion@ > $@ +RPM_SPECS_DATA += arm-rtems@osversion@-$(GCC3NEWLIBVERS).spec -c4x-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@ -RPM_SPECS_DATA += c4x-rtems-$(GCC3NEWLIBVERS).spec +c4x-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems@osversion@ > $@ +RPM_SPECS_DATA += c4x-rtems@osversion@-$(GCC3NEWLIBVERS).spec -h8300-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@ -RPM_SPECS_DATA += h8300-rtems-$(GCC3NEWLIBVERS).spec +h8300-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems@osversion@ > $@ +RPM_SPECS_DATA += h8300-rtems@osversion@-$(GCC3NEWLIBVERS).spec -hppa1.1-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@ -RPM_SPECS_DATA += hppa1.1-rtems-$(GCC3NEWLIBVERS).spec +hppa1.1-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems@osversion@ > $@ +RPM_SPECS_DATA += hppa1.1-rtems@osversion@-$(GCC3NEWLIBVERS).spec -i386-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@ -RPM_SPECS_DATA += i386-rtems-$(GCC3NEWLIBVERS).spec +i386-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache i386-rtems@osversion@ > $@ +RPM_SPECS_DATA += i386-rtems@osversion@-$(GCC3NEWLIBVERS).spec -i960-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@ -RPM_SPECS_DATA += i960-rtems-$(GCC3NEWLIBVERS).spec +i960-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache i960-rtems@osversion@ > $@ +RPM_SPECS_DATA += i960-rtems@osversion@-$(GCC3NEWLIBVERS).spec -m68k-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@ -RPM_SPECS_DATA += m68k-rtems-$(GCC3NEWLIBVERS).spec +m68k-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems@osversion@ > $@ +RPM_SPECS_DATA += m68k-rtems@osversion@-$(GCC3NEWLIBVERS).spec -mips64orion-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@ -RPM_SPECS_DATA += mips64orion-rtems-$(GCC3NEWLIBVERS).spec +mips64orion-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems@osversion@ > $@ +RPM_SPECS_DATA += mips64orion-rtems@osversion@-$(GCC3NEWLIBVERS).spec -mips-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@ -RPM_SPECS_DATA += mips-rtems-$(GCC3NEWLIBVERS).spec +mips-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache mips-rtems@osversion@ > $@ +RPM_SPECS_DATA += mips-rtems@osversion@-$(GCC3NEWLIBVERS).spec -powerpc-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@ -RPM_SPECS_DATA += powerpc-rtems-$(GCC3NEWLIBVERS).spec +powerpc-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems@osversion@ > $@ +RPM_SPECS_DATA += powerpc-rtems@osversion@-$(GCC3NEWLIBVERS).spec -sh-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@ -RPM_SPECS_DATA += sh-rtems-$(GCC3NEWLIBVERS).spec +sh-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtems@osversion@ > $@ +RPM_SPECS_DATA += sh-rtems@osversion@-$(GCC3NEWLIBVERS).spec sh-rtemself-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@ + $(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself@osversion@ > $@ RPM_SPECS_DATA += sh-rtemself-$(GCC3NEWLIBVERS).spec -sparc-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems > $@ -RPM_SPECS_DATA += sparc-rtems-$(GCC3NEWLIBVERS).spec +sparc-rtems@osversion@-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) + $(MKSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems@osversion@ > $@ +RPM_SPECS_DATA += sparc-rtems@osversion@-$(GCC3NEWLIBVERS).spec CLEANFILES += $(RPM_SPECS_DATA) diff --git a/scripts/gcc3newlib/mkspec.in b/scripts/gcc3newlib/mkspec.in index 0492edd10a..aa9abd675b 100644 --- a/scripts/gcc3newlib/mkspec.in +++ b/scripts/gcc3newlib/mkspec.in @@ -71,6 +71,7 @@ sed -e "s,@PATCH1\@,${PATCH1}," \ -e "s%@prefix\@%@prefix@%g" \ -e "s,@rpmprefix\@,@rpmprefix@,g" \ -e "s%@rpmgroup\@%@rpmgroup@%g" \ + -e "s%@osversion\@%@osversion@%g" \ -e "s,@rpm_build_root\@,${rpm_build_root},g" \ -e "s%@gcc_version\@%${gcc3_version}%g" \ -e "s%@gcc_patch_version\@%${gcc3_patch_version}%g" \ diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am index f4d60a92ca..da59ed4d4b 100644 --- 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) diff --git a/scripts/gdb/mkspec.in b/scripts/gdb/mkspec.in index 12e20928fa..39cfa6df0f 100644 --- 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" \ |