diff --git a/bcache-tools-1.0.8-gcc10.patch b/bcache-tools-1.0.8-gcc10.patch new file mode 100644 index 0000000..e821148 --- /dev/null +++ b/bcache-tools-1.0.8-gcc10.patch @@ -0,0 +1,12 @@ +diff -Nrup a/bcache.h b/bcache.h +--- a/bcache.h 2019-10-15 13:33:53.008004124 -0600 ++++ b/bcache.h 2019-10-15 13:34:58.322638870 -0600 +@@ -117,7 +117,7 @@ BITMASK(BDEV_STATE, struct cache_sb, fl + + extern const uint64_t crc_table[]; + +-inline uint64_t crc64(const void *_data, size_t len) ++static inline uint64_t crc64(const void *_data, size_t len) + { + uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; + const unsigned char *data = _data; diff --git a/bcache-tools.spec b/bcache-tools.spec index bcb85b2..4a5494f 100644 --- a/bcache-tools.spec +++ b/bcache-tools.spec @@ -3,7 +3,7 @@ Summary: Tools for Linux kernel block layer cache Name: bcache-tools Version: 1.0.8 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2 URL: http://bcache.evilpiepirate.org/ VCS: https://github.com/g2p/bcache-tools.git @@ -36,6 +36,8 @@ Patch4: bcache-tools-1.0.8-crc64.patch Patch5: bcache-status-python3.patch # Fix BZ#1360951 - this fix is python 3 only Patch6: bcache-status-rootgc.patch +# GCC-10 fix as reported by law@redhat.com +Patch7: bcache-tools-1.0.8-gcc10.patch # This is a kind of soft dependency: because we don't include probe-bcache # we have to make sure that libblkid is able to identify bcache. So this @@ -65,6 +67,7 @@ chmod +x configure %patch5 -p1 -b .python3 %patch6 -p1 -b .rootgc +%patch7 -p1 -b .gcc10 %build %configure @@ -105,6 +108,9 @@ install -p -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status %{dracutlibdir}/modules.d/90bcache %changelog +* Mon Oct 21 2019 Rolf Fokkens - 1.0.8-17 +- Fix build with gcc-10 reported by Jeff Law + * Wed Jul 24 2019 Fedora Release Engineering - 1.0.8-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild