diff options
author | Chris Johns <chrisj@rtems.org> | 2015-02-07 10:43:31 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2015-02-07 10:46:49 +1100 |
commit | 81ccf41bc061093dea5c8dabc320011a10454bda (patch) | |
tree | ae0e2a4fe56974b20ff5852a3365eec595e76818 /source-builder | |
parent | Change to using newlib snapshot release 2.2.0-1 and gdb 7.8.1. (diff) | |
download | rtems-source-builder-81ccf41bc061093dea5c8dabc320011a10454bda.tar.bz2 |
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.
Diffstat (limited to 'source-builder')
-rw-r--r-- | source-builder/config/gdb-7-1.cfg | 9 | ||||
-rw-r--r-- | source-builder/config/gdb-7.8.1-1.cfg | 122 |
2 files changed, 8 insertions, 123 deletions
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 @@ -41,9 +41,16 @@ 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} |