From 8f5dd7bad0b3f943323a1885fdc3d7555af6caa3 Mon Sep 17 00:00:00 2001 From: linjiaxin Date: Fri, 30 Jul 2021 06:25:42 +0000 Subject: [PATCH] fix build error due to gcc 10 error: gcc -Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/generic-hardened-ld -rdynamic -std=gnu99 -Wwrite-strings -Wall -Wdeclaration-after-statement -g -ffast-math -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/generic-hardened-cc1 -fasynchronous-unwind-tables -fstack-clash-protection -D_GNU_SOURCE -include config-host.h -march=armv8-a+crc+crypto -I. -I. -DBITS_PER_LONG=64 -DFIO_VERSION='"fio-3.7"' -o t/fio-dedupe t/dedupe.o lib/rbtree.o t/log.o fio_sem.o pshared.o smalloc.o gettime.o crc/md5.o lib/memalign.o lib/bloom.o t/debug.o crc/xxhash.o t/arch.o crc/murmur3.o crc/crc32c.o crc/crc32c-intel.o crc/crc32c-arm64.o crc/fnv.o -lrbd -lrados -lrados -lnuma -lrdmacm -libverbs -lrt -laio -lz -lm -lpthread -ldl /usr/bin/ld: t/arch.o:/home/abuild/rpmbuild/BUILD/fio-3.7/t/arch.c:4: multiple definition of `tsc_reliable'; gettime.o:/home/abuild/rpmbuild/BUILD/fio-3.7/gettime.c:25: first defined here --- fio.spec | 6 +++++- gcc-10.patch | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gcc-10.patch diff --git a/fio.spec b/fio.spec index d34245a..a85e078 100644 --- a/fio.spec +++ b/fio.spec @@ -1,6 +1,6 @@ Name: fio Version: 3.7 -Release: 10 +Release: 11 Summary: Versatile IO workload generator License: GPLv2 URL: http://git.kernel.dk/?p=fio.git;a=summary @@ -13,6 +13,7 @@ BuildRequires: libpmem-devel libpmemblk-devel Patch0000: fix-glibc-error.patch Patch0001: Modify-python2.7-to-python3-with-requires.patch Patch0002: fio2gnuplot-fix-TabErrors-when-running-with-Python-3.patch +Patch0003: gcc-10.patch %description fio is a tool used to spawn many threads or processes that perform a specific type of io operation specified by the user.It accepts many global parameters inherited @@ -46,6 +47,9 @@ export EXTFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{_mandir}/man1/* %changelog +* Fri Jul 30 2021 linjiaxin5 - 3.7-11 +- Fix failure caused by GCC upgrade to 10 + * Wed Jul 21 2021 lingsheng - 3.7-10 - Remove unnecessary buildrequire gdb diff --git a/gcc-10.patch b/gcc-10.patch new file mode 100644 index 0000000..f86fff4 --- /dev/null +++ b/gcc-10.patch @@ -0,0 +1,9 @@ +--- a/t/arch.c 2021-08-03 15:35:12.952984598 +0800 ++++ b/t/arch.c 2021-08-03 15:34:47.284542645 +0800 +@@ -1,5 +1,5 @@ + #include "../arch/arch.h" + + unsigned long arch_flags = 0; +-bool tsc_reliable; ++extern bool tsc_reliable; + int arch_random; -- Gitee