Fix a duplicate definition flagged by gcc10
This git fixed a couple of weeks ago upstream, the same way.
This commit is contained in:
parent
fd7f0cdadb
commit
23b679cf9b
11
gcc10.patch
Normal file
11
gcc10.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- squashfs-tools/mksquashfs.h.orig 2014-05-09 23:54:13.000000000 -0500
|
||||||
|
+++ squashfs-tools/mksquashfs.h 2020-02-08 22:08:33.275388914 -0600
|
||||||
|
@@ -132,7 +132,7 @@
|
||||||
|
#define BLOCK_OFFSET 2
|
||||||
|
|
||||||
|
extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
|
||||||
|
-struct cache *bwriter_buffer, *fwriter_buffer;
|
||||||
|
+extern struct cache *bwriter_buffer, *fwriter_buffer;
|
||||||
|
extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
|
||||||
|
*to_frag, *locked_fragment, *to_process_frag;
|
||||||
|
extern struct append_file **file_mapping;
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Utility for the creation of squashfs filesystems
|
Summary: Utility for the creation of squashfs filesystems
|
||||||
Name: squashfs-tools
|
Name: squashfs-tools
|
||||||
Version: 4.3
|
Version: 4.3
|
||||||
Release: 24%{?dist}
|
Release: 25%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://squashfs.sourceforge.net/
|
URL: http://squashfs.sourceforge.net/
|
||||||
Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz
|
Source0: http://downloads.sourceforge.net/squashfs/squashfs%{version}.tar.gz
|
||||||
@ -31,6 +31,9 @@ Patch6: 0001-squashfs-tools-Add-zstd-support.patch
|
|||||||
# create_dir_entry needs a qualifier to ensure a copy is emitted if it
|
# create_dir_entry needs a qualifier to ensure a copy is emitted if it
|
||||||
# is not inlined to every caller
|
# is not inlined to every caller
|
||||||
Patch7: inline.patch
|
Patch7: inline.patch
|
||||||
|
# gcc10 tighter checking caught a problem. It was fixed upstream
|
||||||
|
# a couple of weeks ago.
|
||||||
|
Patch8: gcc10.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
@ -54,6 +57,7 @@ contains the utilities for manipulating squashfs filesystems.
|
|||||||
%patch5 -p0
|
%patch5 -p0
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
|
%patch8 -p0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%set_build_flags
|
%set_build_flags
|
||||||
@ -77,6 +81,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/unsquashfs.1
|
|||||||
%{_sbindir}/unsquashfs
|
%{_sbindir}/unsquashfs
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 08 2020 Bruno Wolff III <bruno@wolff.to> - 4.3-25
|
||||||
|
- Fix duplicate definition flagged by gcc10
|
||||||
|
|
||||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-24
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-24
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user