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

testsuite: Fix gdb.base/macscp.exp ccache workaround in SCL mode.

Browse Source 
- Adjust the RHEL/F version string automatically (BZ 797651, BZ 797646).
- Provide gdbtui for RHEL-5 and RHEL-6 as it is removed upstream (BZ 797664).
This commit is contained in:
Jan Kratochvil 2012-02-28 18:05:01 +01:00
parent 9ce5c44987
commit 9e9d7b2bbb
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb-ccache-workaround.patch
View File

@ -7,8 +7,8 @@
+# Workaround ccache making lineno non-zero for command-line definitions. +# Workaround ccache making lineno non-zero for command-line definitions.
+if {[find_gcc] == "gcc" && [file executable "/usr/bin/gcc"]} { +if {[find_gcc] == "gcc" && [file executable "/usr/bin/gcc"]} {
+ set result [catch "exec which gcc" output] + set result [catch "exec which gcc" output]
+ if {$result == 0 && [string first "/ccache/" $output] >= -1} { + if {$result == 0 && [string first "/ccache/" $output] > -1} {
+ lappend options "compiler=/usr/bin/gcc" + lappend options "compiler=/usr/bin/gcc"
+ } + }
+} +}
+ +

33
gdb.spec
View File

@ -33,7 +33,7 @@ Version: 7.4.50.%{snap}
# 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: 21%{?dist} Release: 22%{?dist}
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain
Group: Development/Debuggers Group: Development/Debuggers
@ -106,6 +106,9 @@ Source4: gdbinit
%global libstdcxxpython libstdc++-v3-python-r155978 %global libstdcxxpython libstdc++-v3-python-r155978
Source5: %{libstdcxxpython}.tar.bz2 Source5: %{libstdcxxpython}.tar.bz2
# Provide gdbtui for RHEL-5 and RHEL-6 as it is removed upstream (BZ 797664).
Source6: gdbtui
# Work around out-of-date dejagnu that does not have KFAIL # Work around out-of-date dejagnu that does not have KFAIL
#=drop: That dejagnu is too old to be supported. #=drop: That dejagnu is too old to be supported.
Patch1: gdb-6.3-rh-dummykfail-20041202.patch Patch1: gdb-6.3-rh-dummykfail-20041202.patch
@ -808,12 +811,13 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
find -name "*.orig" | xargs rm -f find -name "*.orig" | xargs rm -f
! find -name "*.rej" # Should not happen. ! find -name "*.rej" # Should not happen.
# Change the version that gets printed at GDB startup, so it is Fedora # Change the version that gets printed at GDB startup, so it is RH specific.
# specific.
# Fedora (%{version}-%{release})
# Red Hat Enterprise Linux (%{version}-%{release})
cat > gdb/version.in << _FOO cat > gdb/version.in << _FOO
%if 0%{!?rhel:1}
Fedora (%{version}-%{release}) Fedora (%{version}-%{release})
%else # !0%{!?rhel:1}
Red Hat Enterprise Linux (%{version}-%{release})
%endif # !0%{!?rhel:1}
_FOO _FOO
# Remove the info and other generated files added by the FSF release # Remove the info and other generated files added by the FSF release
@ -1068,6 +1072,13 @@ make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
cp $RPM_BUILD_DIR/%{gdb_src}/gdb/gdb_gcore.sh $RPM_BUILD_ROOT%{_bindir}/gcore cp $RPM_BUILD_DIR/%{gdb_src}/gdb/gdb_gcore.sh $RPM_BUILD_ROOT%{_bindir}/gcore
chmod 755 $RPM_BUILD_ROOT%{_bindir}/gcore chmod 755 $RPM_BUILD_ROOT%{_bindir}/gcore
# Provide gdbtui for RHEL-5 and RHEL-6 as it is removed upstream (BZ 797664).
%if 0%{?rhel:1} && 0%{?rhel} <= 6
test ! -e $RPM_BUILD_ROOT%{_prefix}/bin/gdbtui
install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/bin/gdbtui
ln -sf gdb.1 $RPM_BUILD_ROOT%{_mandir}/man1/gdbtui.1
%endif # 0%{?rhel:1} && 0%{?rhel} <= 6
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d
touch -r %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d touch -r %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d
sed 's#%%{_sysconfdir}#%{_sysconfdir}#g' <%{SOURCE4} >$RPM_BUILD_ROOT%{_sysconfdir}/gdbinit sed 's#%%{_sysconfdir}#%{_sysconfdir}#g' <%{SOURCE4} >$RPM_BUILD_ROOT%{_sysconfdir}/gdbinit
@ -1190,6 +1201,11 @@ fi
%{_mandir}/*/gdb.1* %{_mandir}/*/gdb.1*
%{_bindir}/gstack %{_bindir}/gstack
%{_mandir}/*/gstack.1* %{_mandir}/*/gstack.1*
# Provide gdbtui for RHEL-5 and RHEL-6 as it is removed upstream (BZ 797664).
%if 0%{?rhel:1} && 0%{?rhel} <= 6
%{_bindir}/gdbtui
%{_mandir}/*/gdbtui.1*
%endif # 0%{?rhel:1} && 0%{?rhel} <= 6
# gdb-add-index does not have sufficient version of elfutils on RHEL-5 (in SCL). # gdb-add-index does not have sufficient version of elfutils on RHEL-5 (in SCL).
%if !(0%{?el5:1} && 0%{?scl:1}) %if !(0%{?el5:1} && 0%{?scl:1})
%{_bindir}/gdb-add-index %{_bindir}/gdb-add-index
@ -1217,8 +1233,13 @@ fi
%{_infodir}/gdb.info* %{_infodir}/gdb.info*
%changelog %changelog
* Tue Feb 28 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-22.fc17
- testsuite: Fix gdb.base/macscp.exp ccache workaround in SCL mode.
- Adjust the RHEL/F version string automatically (BZ 797651, BZ 797646).
- Provide gdbtui for RHEL-5 and RHEL-6 as it is removed upstream (BZ 797664).
* Fri Feb 24 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-21.fc17 * Fri Feb 24 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-21.fc17
- Do not use gcc44/gfortran44 on RHEL-5 if in SCL mode. - testsuite: Do not use gcc44/gfortran44 on RHEL-5 if in SCL mode.
* Wed Feb 22 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-20.fc17 * Wed Feb 22 2012 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.4.50.20120120-20.fc17
- Fix libinproctrace.so build on RHEL-5 i386 (disable it on RHEL-5). - Fix libinproctrace.so build on RHEL-5 i386 (disable it on RHEL-5).

2
gdbtui Executable file
View File

@ -0,0 +1,2 @@
#! /bin/sh
exec gdb -tui "$@"