rpms/gdb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

[rhel6 dts] Use devtoolset gcc for GDB being now in C++11.

Browse Source
This commit is contained in:
Jan Kratochvil 2017-06-12 21:57:44 +02:00
parent c52da2003f
commit 4d0140dca1
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gdb.spec
View File

@ -26,7 +26,7 @@ Version: 8.0
# The release always contains a leading reserved number, start it at 1. # The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
Release: 16%{?dist} Release: 17%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
Group: Development/Debuggers Group: Development/Debuggers
@ -126,6 +126,11 @@ BuildRequires: %{librpmname}
Recommends: %{librpmname} Recommends: %{librpmname}
%endif %endif
%if 0%{?el6:1}
# GDB C++11 requires devtoolset gcc.
BuildRequires: %{?scl_prefix}gcc-c++
%endif
# GDB patches have the format `gdb-<version>-bz<red-hat-bz-#>-<desc>.patch'. # GDB patches have the format `gdb-<version>-bz<red-hat-bz-#>-<desc>.patch'.
# They should be created using patch level 1: diff -up ./gdb (or gdb-6.3/gdb). # They should be created using patch level 1: diff -up ./gdb (or gdb-6.3/gdb).
@ -1091,6 +1096,11 @@ rm -rf %{buildroot}
test -e %{_root_libdir}/librpm.so.%{librpmver} test -e %{_root_libdir}/librpm.so.%{librpmver}
%if 0%{?el6:1}
# GDB C++11 requires devtoolset gcc.
%{?scl:PATH=%{_bindir}${PATH:+:${PATH}}}
%endif
# Identify the build directory with the version of gdb as well as the # Identify the build directory with the version of gdb as well as the
# architecture, to allow for mutliple versions to be installed and # architecture, to allow for mutliple versions to be installed and
# built. # built.
@ -1376,6 +1386,11 @@ echo ====================TESTING END=====================
cd %{gdb_build} cd %{gdb_build}
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%if 0%{?el6:1}
# GDB C++11 requires devtoolset gcc.
%{?scl:PATH=%{_bindir}${PATH:+:${PATH}}}
%endif
make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
%if 0%{!?scl:1} %if 0%{!?scl:1}
@ -1524,7 +1539,12 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
# File must begin with "/": {GFDL,COPYING3,COPYING,COPYING.LIB,COPYING3.LIB}
%if 0%{!?el6:1}
%license COPYING3 COPYING COPYING.LIB COPYING3.LIB %license COPYING3 COPYING COPYING.LIB COPYING3.LIB
%else
%doc COPYING3 COPYING COPYING.LIB COPYING3.LIB
%endif
%doc README NEWS %doc README NEWS
%{_bindir}/gdb %{_bindir}/gdb
%{_bindir}/gcore %{_bindir}/gcore
@ -1615,6 +1635,9 @@ then
fi fi
%changelog %changelog
* Mon Jun 12 2017 Jan Kratochvil <jan.kratochvil@redhat.com> - 8.0-17.fc26
- [rhel6 dts] Use devtoolset gcc for GDB being now in C++11.
* Sat Jun 10 2017 Jan Kratochvil <jan.kratochvil@redhat.com> - 8.0-16.fc26 * Sat Jun 10 2017 Jan Kratochvil <jan.kratochvil@redhat.com> - 8.0-16.fc26
- [dts] Upgrade libstdc++-v3-python to 7.1.1-20170526. - [dts] Upgrade libstdc++-v3-python to 7.1.1-20170526.