diff options
| -rw-r--r-- | scripts/ChangeLog | 4 | ||||
| -rw-r--r-- | scripts/gdb/gdb.add | 7 | ||||
| -rw-r--r-- | scripts/setup.def | 24 |
3 files changed, 22 insertions, 13 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 079b2bc2fe..b4737efa9d 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2005-08-29 Joel Sherrill <joel@OARcorp.com> + + * setup.def, gdb/gdb.add: Use DESTDIR as override with gdb 6.3. + 2005-08-25 Ralf Corsepius <ralf.corsepius@rtems.org> * gccnewlib/gccnewlib.add: Remove vxaddr2line. diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add index 42787294a6..72aa8a4b01 100644 --- a/scripts/gdb/gdb.add +++ b/scripts/gdb/gdb.add @@ -56,7 +56,7 @@ BuildRequires: ncurses-devel %define _sim 1 %endif %if "%{gdb_target}" == "sparc-rtems@osversion@" -%define _sim 0 +%define _sim 1 %endif @@ -106,6 +106,10 @@ cd .. rm -rf $RPM_BUILD_ROOT cd build +%if "%{gdb_version}" >= "6.3" + make DESTDIR=$RPM_BUILD_ROOT install + make DESTDIR=$RPM_BUILD_ROOT install-info +%%else make prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \ @@ -120,6 +124,7 @@ cd .. infodir=$RPM_BUILD_ROOT%{_infodir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ install-info +%endif # host files rm -rf $RPM_BUILD_ROOT%{_includedir}/*.h diff --git a/scripts/setup.def b/scripts/setup.def index 2b54b022cb..13964d173b 100644 --- a/scripts/setup.def +++ b/scripts/setup.def @@ -3,20 +3,20 @@ # # $Id$ # -binutils_version=2.15 -binutils_patch_version=20040519 +binutils_version=2.16.1 +binutils_patch_version=20050816 binutils_suffix=.tar.bz2 -binutils_rpm_release=1 -gdb_version=6.0 -gdb_suffix=.tar.gz -gdb_patch_version=20040217 +binutils_rpm_release=3 +gdb_version=6.3 +gdb_suffix=.tar.bz2 +gdb_patch_version=20050828 gdb_rpm_release=1 rtems_version=4.6.99.1 rtems_rpm_release=1 -newlib_version=1.12.0 +newlib_version=1.13.0 newlib_suffix=.tar.gz -newlib_patch_version= -gcc_version=3.3.5 -gcc_suffix=.tar.gz -gcc_patch_version=20041030 -gccnewlib_rpm_release=2 +newlib_patch_version=20050810 +gcc_version=4.0.1 +gcc_suffix=.tar.bz2 +gcc_patch_version=20050810 +gccnewlib_rpm_release=4 |