From 1919df08fd2d806d4d622d3434ae83a4b10da36a Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 6 Feb 2018 06:27:37 +0100 Subject: [PATCH] Fix .spec build compatibility with <=F-27 and <=RHEL-7. [testsuite] Temporarily disable BuildRequires: gcc-go (for RH BZ 1541639). --- gdb.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb.spec b/gdb.spec index d5590cb..a8e6128 100644 --- a/gdb.spec +++ b/gdb.spec @@ -26,13 +26,13 @@ Version: 8.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. -Release: 5%{?dist} +Release: 6%{?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 # Do not provide URL for snapshots as the file lasts there only for 2 days. # ftp://sourceware.org/pub/gdb/releases/FIXME{tarname}.tar.xz -#Source: %{tarname}.tar.xz +#Source: % {tarname}.tar.xz Source: ftp://sourceware.org/pub/gdb/releases/%{tarname}.tar.xz Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://gnu.org/software/gdb/ @@ -274,6 +274,8 @@ BuildRequires: gcc-java libgcj%{bits_local} libgcj%{bits_other} # for gcc-java linkage: BuildRequires: zlib-devel%{bits_local} zlib-devel%{bits_other} %endif +# FIXME: https://bugzilla.redhat.com/show_bug.cgi?id=1541639 +%if 0 # Exception for RHEL<=7 %ifarch aarch64 %if 0%{!?rhel:1} || 0%{?rhel} > 7 @@ -286,6 +288,7 @@ BuildRequires: gcc-go BuildRequires: libgo-devel%{bits_local} libgo-devel%{bits_other} %endif %endif +%endif # archer-sergiodj-stap-patch-split BuildRequires: systemtap-sdt-devel %if 0%{?rhel:1} && 0%{?rhel} <= 7 @@ -497,6 +500,7 @@ cd %{gdb_build}$fprofile export CFLAGS="$RPM_OPT_FLAGS %{?_with_asan:-fsanitize=address}" export LDFLAGS="%{?__global_ldflags} %{?_with_asan:-fsanitize=address}" +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 # FIXME: gcc-8.0: # ./elf32-target.h:215:4: error: cast between incompatible function types from 'void * (*)(bfd *)' {aka 'void * (*)(struct bfd *)'} to 'asymbol * (*)(bfd *, void *, long unsigned int)' {aka 'struct bfd_symbol * (*)(struct bfd *, void *, long unsigned int)'} [-Werror=cast-function-type] # ((asymbol * (*) (bfd *, void *, unsigned long)) bfd_nullvoidptr) @@ -506,6 +510,7 @@ CFLAGS="$CFLAGS -Wno-error=cast-function-type" # linux-tdep.c:1767:11: error: ‘char* strncpy(char*, const char*, size_t)’ specified bound 17 equals destination size [-Werror=stringop-truncation] # strncpy (p->pr_fname, basename, sizeof (p->pr_fname)); CFLAGS="$CFLAGS -Wno-error=stringop-truncation" +%endif # 0%{?fedora} > 27 || 0%{?rhel} > 7 %if 0%{!?rhel:1} || 0%{?rhel} > 7 CFLAGS="$CFLAGS -DDNF_DEBUGINFO_INSTALL" @@ -1027,6 +1032,10 @@ then fi %changelog +* Tue Feb 6 2018 Jan Kratochvil - 8.1-6.fc28 +- Fix .spec build compatibility with <=F-27 and <=RHEL-7. +- [testsuite] Temporarily disable BuildRequires: gcc-go (for RH BZ 1541639). + * Sun Feb 4 2018 Jan Kratochvil - 8.1-5.fc28 - Workaround gcc-8.0: -Wno-error=cast-function-type,stringop-truncation - Fix ppc64 stwux encoding as found by gcc-8.0 -Werror=tautological-compare.