diff --git a/gdb.changes b/gdb.changes index fba0dbd..f8f5d33 100644 --- a/gdb.changes +++ b/gdb.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Wed Jul 3 11:38:05 UTC 2019 - Tom de Vries + +- Add BuildRequires valgrind for make check + +------------------------------------------------------------------- +Wed Jul 3 11:02:06 UTC 2019 - Tom de Vries + +- Move BuildRequires gcc-go and fpc to %{with testsuite} portion + +------------------------------------------------------------------- +Wed Jul 3 10:53:05 UTC 2019 - Tom de Vries + +- Copy %ada_arch from gcc9 and use it to fix 'unresolvable: nothing + provides gcc-ada' for openSUSE_Leap_42.3_Ports/SLE-12 ppc64le. + +------------------------------------------------------------------- +Wed Jul 3 08:37:30 UTC 2019 - Tom de Vries + +- Drop ppc64le for fpc + +------------------------------------------------------------------- +Wed Jul 3 08:27:11 UTC 2019 - Tom de Vries + +- Add missing %endif + +------------------------------------------------------------------- +Wed Jul 3 08:15:33 UTC 2019 - Tom de Vries + +- Add BuildRequire fpc for make check + +------------------------------------------------------------------- +Wed Jul 3 06:47:49 UTC 2019 - Tom de Vries + +- Add comment explaining why guile support has been disabled for + newer distro versions. + +------------------------------------------------------------------- +Tue Jul 2 17:46:53 UTC 2019 - Tom de Vries + +- Add BuildRequire gcc-go to get gccgo command for make check + +------------------------------------------------------------------- +Tue Jul 2 13:48:51 UTC 2019 - Tom de Vries + +- Copy gdbinit from fedora master @ 25caf28. Add + gdbinit.without-python, and use it for --without=python. + ------------------------------------------------------------------- Mon Jul 1 06:28:27 UTC 2019 - Tom de Vries diff --git a/gdb.spec b/gdb.spec index 1084aa9..c300da0 100644 --- a/gdb.spec +++ b/gdb.spec @@ -83,6 +83,7 @@ Source3: gdb-gstack.man # /etc/gdbinit (from Debian but with Fedora compliant location). #=fedora Source4: gdbinit +Source5: gdbinit.without-python # libipt: Intel Processor Trace Decoder Library %global libipt_version 2.0 @@ -253,6 +254,8 @@ BuildRequires: %{gcc}-c++ BuildRequires: gettext BuildRequires: glibc-devel %if 0%{suse_version} > 1110 && 0%{suse_version} < 1330 +# GDB supports guile 2.0, but not guile 2.2 (swo#21104). Disable guile +# support for newer distro versions in anticipation of a move to guile 2.2. BuildRequires: guile-devel %endif BuildRequires: ncurses-devel @@ -289,6 +292,20 @@ ExclusiveArch: noarch i386 x86_64 ppc ppc64 ia64 s390 s390x %if %{with testsuite} +# Copied from gcc9/gcc.spec.in +# Ada currently fails to build on a few platforms, enable it only +# on those that work +%if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 s390x ia64 aarch64 riscv64 +%else +%define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif +%else +%define ada_arch %ix86 x86_64 ppc s390 ia64 +%endif + + # Ensure the devel libraries are installed for both multilib arches. %global bits_local %{?_isa} %global bits_other %{?_isa} @@ -314,15 +331,9 @@ BuildRequires: %{gcc}-fortran BuildRequires: %{gcc}-java %endif BuildRequires: %{gcc}-objc -# Copied from gcc-4.1.2-32. -%ifarch %{ix86} x86_64 ia64 ppc ppc64 ppc64le riscv64 s390 alpha +%ifarch %ada_arch BuildRequires: %{gcc}-ada %endif -%ifarch aarch64 -%if 0%{suse_version} >= 1330 -BuildRequires: %{gcc}-ada -%endif -%endif %if 0%{!?disable_32bit:1} # openSUSE for s390x doesn't build 32bit libs %if 0%{suse_version} > 1110 @@ -342,6 +353,21 @@ BuildRequires: glibc-devel-static-32bit %if 0%{suse_version} >= 1210 BuildRequires: glibc-devel-static %endif +%if 0%{?suse_version} > 1500 +# The gccgo command is used by make check for some gdb.go test-cases, so we +# need the gcc-go package. However, the gccgo command was missing from the +# gcc-go package (bsc#1096677), so we only require it for known fixed +# versions. +BuildRequires: gcc-go +%endif +%if 0%{?suse_version} >= 1500 && 0%{?is_opensuse} +%ifarch %{ix86} x86_64 aarch64 armv7l +BuildRequires: fpc +%endif +%endif +%if 0%{?suse_version} >= 1200 +BuildRequires: valgrind +%endif %endif # %%{with testsuite} @@ -897,8 +923,14 @@ make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d touch -r %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d + +%if 0%{!?_without_python:1} sed 's#%%{_sysconfdir}#%{_sysconfdir}#g' <%{SOURCE4} >$RPM_BUILD_ROOT%{_sysconfdir}/gdbinit touch -r %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit +%else +sed 's#%%{_sysconfdir}#%{_sysconfdir}#g' <%{SOURCE5} >$RPM_BUILD_ROOT%{_sysconfdir}/gdbinit +touch -r %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit +%endif for i in `find $RPM_BUILD_ROOT%{_datadir}/gdb/python/gdb -name "*.py"` do diff --git a/gdbinit b/gdbinit index 2699a7b..2ed6e59 100644 --- a/gdbinit +++ b/gdbinit @@ -1,3 +1,8 @@ # System-wide GDB initialization file. - -# FIXME: provide a wildcard for sourcing files in /etc/gdbinit.d/ +python +import glob +for f in glob.glob('%{_sysconfdir}/gdbinit.d/*.gdb'): + gdb.execute('source %s' % f) +for f in glob.glob('%{_sysconfdir}/gdbinit.d/*.py'): + gdb.execute('source %s' % f) +end diff --git a/gdbinit.without-python b/gdbinit.without-python new file mode 100644 index 0000000..c70a140 --- /dev/null +++ b/gdbinit.without-python @@ -0,0 +1,5 @@ +# System-wide GDB initialization file. + +# FIXME: Source /etc/gdbinit.d/*.gdb +# Without python support, there's currently no way to do this. See also +# swo#13578 - "source command file globbing".