From 138f53b360a04c979da1ff83e0f3c07245dc4f91 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Thu, 12 Jul 2018 12:25:43 +0200 Subject: [PATCH] [dts] [rhel6] Do not use mpfr as rhel6 has mpfr-2 while GDB requires mpfr-3. --- gdb.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gdb.spec b/gdb.spec index 8b74d3a..f928885 100644 --- a/gdb.spec +++ b/gdb.spec @@ -26,7 +26,7 @@ Version: 8.1.90.%{snapsrc} # 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. -Release: 32%{?dist} +Release: 33%{?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 Group: Development/Debuggers @@ -244,8 +244,11 @@ BuildRequires: libipt-devel%{buildisa} %endif %endif %endif +%if 0%{!?rhel:1} || 0%{?rhel} > 6 # See https://bugzilla.redhat.com/show_bug.cgi?id=1593280 +# DTS RHEL-6 has mpfr-2 while GDB requires mpfr-3. BuildRequires: mpfr-devel%{buildisa} +%endif %if 0%{?_with_testsuite:1} @@ -614,7 +617,11 @@ $(: ppc64 host build crashes on ppc variant of libexpat.so ) \ %else --without-intel-pt \ %endif +%if 0%{!?rhel:1} || 0%{?rhel} > 6 --with-mpfr \ +%else + --without-mpfr \ +%endif --with-auto-load-dir='$debugdir:$datadir/auto-load%{?scl::%{_root_datadir}/gdb/auto-load}' \ --with-auto-load-safe-path='$debugdir:$datadir/auto-load%{?scl::%{_root_datadir}/gdb/auto-load}' \ %ifarch sparc sparcv9 @@ -1023,6 +1030,9 @@ fi %endif %changelog +* Thu Jul 12 2018 Jan Kratochvil - 8.1.90.20180708-33.fc29 +- [dts] [rhel6] Do not use mpfr as rhel6 has mpfr-2 while GDB requires mpfr-3. + * Thu Jul 12 2018 Jan Kratochvil - 8.1.90.20180708-32.fc29 - Remove as no longer needed: Workaround gcc-8.0: -Wno-error=cast-function-type,stringop-truncation