From 81ccf41bc061093dea5c8dabc320011a10454bda Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Sat, 7 Feb 2015 10:43:31 +1100 Subject: Update all 4.11 archs to newlib-2.2.0-1 and gdb-7.8.2 where possible. Remove the extra gdb-7.8.1.cfg and added support to allow GDB tar compression to be version defined. GDB has changed it default to .xz. --- rtems/config/4.11/rtems-arm.bset | 2 +- rtems/config/4.11/rtems-avr.bset | 2 +- rtems/config/4.11/rtems-bfin.bset | 2 +- rtems/config/4.11/rtems-h8300.bset | 2 +- rtems/config/4.11/rtems-i386.bset | 2 +- rtems/config/4.11/rtems-lm32.bset | 2 +- rtems/config/4.11/rtems-m32c.bset | 2 +- rtems/config/4.11/rtems-m32r.bset | 2 +- rtems/config/4.11/rtems-m68k.bset | 2 +- rtems/config/4.11/rtems-microblaze.bset | 2 +- rtems/config/4.11/rtems-mips.bset | 2 +- rtems/config/4.11/rtems-moxie.bset | 2 +- rtems/config/4.11/rtems-nios2.bset | 2 +- rtems/config/4.11/rtems-powerpc.bset | 2 +- rtems/config/4.11/rtems-sh.bset | 2 +- rtems/config/4.11/rtems-sparc.bset | 2 +- rtems/config/4.11/rtems-sparc64.bset | 2 +- rtems/config/4.11/rtems-v850.bset | 2 +- rtems/config/tools/rtems-gdb-7.8.1-1.cfg | 4 +- rtems/config/tools/rtems-gdb-7.8.2-1.cfg | 29 ++++++++ source-builder/config/gdb-7-1.cfg | 9 ++- source-builder/config/gdb-7.8.1-1.cfg | 122 ------------------------------- 22 files changed, 57 insertions(+), 143 deletions(-) create mode 100644 rtems/config/tools/rtems-gdb-7.8.2-1.cfg delete mode 100644 source-builder/config/gdb-7.8.1-1.cfg diff --git a/rtems/config/4.11/rtems-arm.bset b/rtems/config/4.11/rtems-arm.bset index 13fe6bf..b227dc4 100644 --- a/rtems/config/4.11/rtems-arm.bset +++ b/rtems/config/4.11/rtems-arm.bset @@ -23,6 +23,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-avr.bset b/rtems/config/4.11/rtems-avr.bset index 3506166..df91bf6 100644 --- a/rtems/config/4.11/rtems-avr.bset +++ b/rtems/config/4.11/rtems-avr.bset @@ -36,6 +36,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-bfin.bset b/rtems/config/4.11/rtems-bfin.bset index a2e975f..bf153c6 100644 --- a/rtems/config/4.11/rtems-bfin.bset +++ b/rtems/config/4.11/rtems-bfin.bset @@ -18,6 +18,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-h8300.bset b/rtems/config/4.11/rtems-h8300.bset index d558903..99addf0 100644 --- a/rtems/config/4.11/rtems-h8300.bset +++ b/rtems/config/4.11/rtems-h8300.bset @@ -23,6 +23,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.8.3-newlib-git-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-i386.bset b/rtems/config/4.11/rtems-i386.bset index 8051524..baad5b7 100644 --- a/rtems/config/4.11/rtems-i386.bset +++ b/rtems/config/4.11/rtems-i386.bset @@ -18,6 +18,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-lm32.bset b/rtems/config/4.11/rtems-lm32.bset index 3d61a0a..93094de 100644 --- a/rtems/config/4.11/rtems-lm32.bset +++ b/rtems/config/4.11/rtems-lm32.bset @@ -24,6 +24,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-m32c.bset b/rtems/config/4.11/rtems-m32c.bset index 0ac2648..37b1d27 100644 --- a/rtems/config/4.11/rtems-m32c.bset +++ b/rtems/config/4.11/rtems-m32c.bset @@ -42,6 +42,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.8.3-newlib-git-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-m32r.bset b/rtems/config/4.11/rtems-m32r.bset index 96ee76c..d254bff 100644 --- a/rtems/config/4.11/rtems-m32r.bset +++ b/rtems/config/4.11/rtems-m32r.bset @@ -18,6 +18,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-m68k.bset b/rtems/config/4.11/rtems-m68k.bset index 0104586..9e0804d 100644 --- a/rtems/config/4.11/rtems-m68k.bset +++ b/rtems/config/4.11/rtems-m68k.bset @@ -18,6 +18,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-microblaze.bset b/rtems/config/4.11/rtems-microblaze.bset index 75b1d45..c7ff040 100644 --- a/rtems/config/4.11/rtems-microblaze.bset +++ b/rtems/config/4.11/rtems-microblaze.bset @@ -29,6 +29,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-mips.bset b/rtems/config/4.11/rtems-mips.bset index a3ef266..48b05fe 100644 --- a/rtems/config/4.11/rtems-mips.bset +++ b/rtems/config/4.11/rtems-mips.bset @@ -28,7 +28,7 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-mipstx39-gdb-7.7-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-moxie.bset b/rtems/config/4.11/rtems-moxie.bset index 35052a1..7067265 100644 --- a/rtems/config/4.11/rtems-moxie.bset +++ b/rtems/config/4.11/rtems-moxie.bset @@ -24,6 +24,6 @@ devel/expat-2.1.0-1 devel/dtc-1.2.0 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-nios2.bset b/rtems/config/4.11/rtems-nios2.bset index 9087b89..daa7c45 100644 --- a/rtems/config/4.11/rtems-nios2.bset +++ b/rtems/config/4.11/rtems-nios2.bset @@ -18,6 +18,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-powerpc.bset b/rtems/config/4.11/rtems-powerpc.bset index 9a96544..20620e4 100644 --- a/rtems/config/4.11/rtems-powerpc.bset +++ b/rtems/config/4.11/rtems-powerpc.bset @@ -28,6 +28,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-sh.bset b/rtems/config/4.11/rtems-sh.bset index 5e0a7d9..6f3cfe1 100644 --- a/rtems/config/4.11/rtems-sh.bset +++ b/rtems/config/4.11/rtems-sh.bset @@ -18,6 +18,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-sparc.bset b/rtems/config/4.11/rtems-sparc.bset index 669cbd2..63db1b9 100644 --- a/rtems/config/4.11/rtems-sparc.bset +++ b/rtems/config/4.11/rtems-sparc.bset @@ -37,6 +37,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-sparc64.bset b/rtems/config/4.11/rtems-sparc64.bset index cbf36aa..f76da56 100644 --- a/rtems/config/4.11/rtems-sparc64.bset +++ b/rtems/config/4.11/rtems-sparc64.bset @@ -18,6 +18,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/4.11/rtems-v850.bset b/rtems/config/4.11/rtems-v850.bset index ed1c4cb..8cf294e 100644 --- a/rtems/config/4.11/rtems-v850.bset +++ b/rtems/config/4.11/rtems-v850.bset @@ -23,6 +23,6 @@ devel/expat-2.1.0-1 tools/rtems-binutils-2.24-1 tools/rtems-gcc-4.9.2-newlib-2.2.0-1-1 -tools/rtems-gdb-7.8.1-1 +tools/rtems-gdb-7.8.2-1 tools/rtems-tools-4.11-1 tools/rtems-kernel-4.11 diff --git a/rtems/config/tools/rtems-gdb-7.8.1-1.cfg b/rtems/config/tools/rtems-gdb-7.8.1-1.cfg index 297650d..c4bc19f 100644 --- a/rtems/config/tools/rtems-gdb-7.8.1-1.cfg +++ b/rtems/config/tools/rtems-gdb-7.8.1-1.cfg @@ -7,7 +7,7 @@ %define gdb_version 7.8.1 -%hash md5 gdb-%{gdb_version}.tar.gz 997492cc3475c96f35ecc8775248c9b1 +#%hash md5 gdb-%{gdb_version}.tar.bz2 997492cc3475c96f35ecc8775248c9b1 # # Clean up the sim-arange inline code so it builds. @@ -25,4 +25,4 @@ # # The gdb build instructions. We use 7.xx Release 1. # -%include %{_configdir}/gdb-7.8.1-1.cfg +%include %{_configdir}/gdb-7-1.cfg diff --git a/rtems/config/tools/rtems-gdb-7.8.2-1.cfg b/rtems/config/tools/rtems-gdb-7.8.2-1.cfg new file mode 100644 index 0000000..1008a29 --- /dev/null +++ b/rtems/config/tools/rtems-gdb-7.8.2-1.cfg @@ -0,0 +1,29 @@ +# +# GDB 7.8.2 +# + +%include %{_configdir}/checks.cfg +%include %{_configdir}/base.cfg + +%define gdb_version 7.8.2 +%define gdb_src_ext xz + +#%hash md5 gdb-%{gdb_version}.tar.xz 997492cc3475c96f35ecc8775248c9b1 + +# +# Clean up the sim-arange inline code so it builds. +# +%patch add gdb %{rtems_gdb_patches}/gdb-sim-arange-inline.diff +%hash md5 gdb-sim-arange-inline.diff 11bb2936ea29afeaa023077191fd4705 +%patch add gdb %{rtems_gdb_patches}/gdb-sim-cgen-inline.diff +%hash md5 gdb-sim-cgen-inline.diff e6f7d6d7295cdba99f51aab514ea9778 + +%if %{_build_os} == freebsd + %patch add gdb -p0 %{rtems_gdb_patches}/patch-gdb-python-python-config.py + %hash md5 patch-gdb-python-python-config.py c0260fcca4c1a5509635049c0094eee3 +%endif + +# +# The gdb build instructions. We use 7.xx Release 1. +# +%include %{_configdir}/gdb-7-1.cfg diff --git a/source-builder/config/gdb-7-1.cfg b/source-builder/config/gdb-7-1.cfg index 11d2cbc..a5239ee 100644 --- a/source-builder/config/gdb-7-1.cfg +++ b/source-builder/config/gdb-7-1.cfg @@ -40,10 +40,17 @@ Release: %{release} URL: http://www.gnu.org/software/gdb/ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) +# +# GDB has changed it default extension. +# +%ifn %{defined gdb_src_ext} + %define gdb_src_ext gz +%endif + # # Source # -%source set gdb http://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2 +%source set gdb http://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.%{gdb_src_ext} # # Disable Python on Cxc builds for now. diff --git a/source-builder/config/gdb-7.8.1-1.cfg b/source-builder/config/gdb-7.8.1-1.cfg deleted file mode 100644 index 45d3272..0000000 --- a/source-builder/config/gdb-7.8.1-1.cfg +++ /dev/null @@ -1,122 +0,0 @@ -# -# GDB 7.xx Version 1. -# -# This configuration file configure's, make's and install's gdb. -# - -# -# See if the simulator has been disabled for Windows. -# -%if %{_host_os} == mingw32 - %if %{defined win32-gdb-disable-sim} - %define gdb-disable-sim 1 - %endif -%endif - -# -# Default to building simulators. -# -%ifn %{defined gdb-disable-sim} - %define gdb-disable-sim 0 -%else - %undefine gdb-sim-options -%endif - -%include %{_configdir}/checks.cfg - -# -# Select Snapshot Macro Maps -# -%select gdb-snapshot -%select expat-snapshot - -# -# The description. -# -Name: %{_target}-gdb-%{gdb_version}-%{release} -Summary: GDB v%{gdb_version} for target %{_target} on host %{_host} -Version: %{gdb_version} -Release: %{release} -URL: http://www.gnu.org/software/gdb/ -BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) - -# -# Source -# -%source set gdb http://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.gz - -# -# Disable Python on Cxc builds for now. -# -%if "%{_build}" != "%{_host}" - %define without_python -%endif - -# -# -# Prepare the source code. -# -%prep - build_top=$(pwd) - - source_dir_gdb="gdb-%{gdb_version}" - %source setup gdb -q -n gdb-%{gdb_version} - %patch setup gdb -p1 - - cd ${build_top} - -%build - build_top=$(pwd) - - %{build_directory} - - mkdir -p ${build_dir} - cd ${build_dir} - - %{host_build_flags} - - if test "%{_build}" != "%{_host}" ; then - GDB_LIBS_STATIC="-lexpat" - else - GDB_LIBS_STATIC="-lexpat" - GDB_LIBS="%{_forced_static}" - fi - - LIBS_STATIC=${GDB_LIBS_STATIC} \ - LIBS=${GDB_LIBS} \ - ../${source_dir_gdb}/configure \ - --build=%{_build} --host=%{_host} \ - --target=%{_target} \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{!?gdb-disable-sim:--enable-sim}%{?gdb-disable-sim:--disable-sim} \ - %{?gdb-sim-options:%{gdb-sim-options}} \ - --without-zlib \ - --with-expat \ - %{!?without_python:--with-python} \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - %{__make} %{?_smp_mflags} all - - cd ${build_top} - -%install - build_top=$(pwd) - - %{__rmdir} $SB_BUILD_ROOT - - cd ${build_dir} - %{__make} DESTDIR=$SB_BUILD_ROOT install - - # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - %{__rmdir} $SB_BUILD_ROOT%{_infodir}/configure.info* - - %{__rmfile} $SB_BUILD_ROOT%{_infodir}/dir - touch $SB_BUILD_ROOT%{_infodir}/dir - - cd ${build_top} -- cgit v1.2.3