diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-07-21 12:33:19 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-07-21 12:33:19 +0000 |
| commit | 6dae02b4a8f5bbce2b56138dd404f4e51a3712ec (patch) | |
| tree | 919a3f12e3acfc8c0b98de7aae2a1e36cdd36b38 | |
| parent | da3d35840f6e277967a39cacbda3b7ba5c167983 (diff) | |
Sync with rtems-4.10.
| -rw-r--r-- | contrib/crossrpms/rtems4.8/binutils.am | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/rtems4.8/gcc.am | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/rtems4.8/gdb.am | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/contrib/crossrpms/rtems4.8/binutils.am b/contrib/crossrpms/rtems4.8/binutils.am index bf0539e77f..93578ea74a 100644 --- a/contrib/crossrpms/rtems4.8/binutils.am +++ b/contrib/crossrpms/rtems4.8/binutils.am @@ -18,7 +18,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "/[@]SOURCES[@]/d" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ - -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ + -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \ -e "/--with-sysroot/d" \ | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/rtems4.8/gcc.am b/contrib/crossrpms/rtems4.8/gcc.am index 887941f135..66cf59b8d0 100644 --- a/contrib/crossrpms/rtems4.8/gcc.am +++ b/contrib/crossrpms/rtems4.8/gcc.am @@ -27,8 +27,10 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \ - -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ + -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \ -e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \ + -e "s/[@]NEWLIB_PKGVERS[@]/$(NEWLIB_PKGVERS)/g" \ + -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \ -e "/--with-sysroot/d" \ -e "/[@]tool_target[@]-sys-root/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ diff --git a/contrib/crossrpms/rtems4.8/gdb.am b/contrib/crossrpms/rtems4.8/gdb.am index fd6ac388b3..4b509c4547 100644 --- a/contrib/crossrpms/rtems4.8/gdb.am +++ b/contrib/crossrpms/rtems4.8/gdb.am @@ -18,7 +18,7 @@ $(TARGET)-gdb.spec.in: $(GDB_SUBPACKAGES) Makefile.am $(srcdir)/gdb-sources.add -e "/[@]SOURCES[@]/d" \ -e "s/[@]GDB_VERS[@]/$(GDB_VERS)/g" \ -e "s/[@]GDB_PKGVERS[@]/$(GDB_PKGVERS)/g" \ - -e "s/[@]GDB_RPMREL[@]/$(GDB_RPMREL)/g" \ + -e "s/[@]GDB_RPMREL[@]/$(GDB_RPMREL)%{?dist}/g" \ -e "/--with-sysroot/d" \ | $(MKSPEC0) > $(TARGET)-gdb.spec.in CLEANFILES += $(TARGET)-gdb.spec.in |