]> git.pld-linux.org Git - packages/cpio.git/commitdiff
fix build with gcc 10
authorJan Palus <atler@pld-linux.org>
Wed, 18 Nov 2020 23:07:26 +0000 (00:07 +0100)
committerJan Palus <atler@pld-linux.org>
Wed, 18 Nov 2020 23:07:26 +0000 (00:07 +0100)
cpio.spec
gcc10.patch [new file with mode: 0644]

index 23f781efe3f1068b73beaf50294cd3d6e23809e1..20048740118160e2b930800fb27be075cb343dd7 100644 (file)
--- a/cpio.spec
+++ b/cpio.spec
@@ -19,6 +19,7 @@ Source1:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-ifdef.patch
 Patch2:                revert-CVE-2015-1197-fix.patch
+Patch3:                gcc10.patch
 URL:           http://www.gnu.org/software/cpio/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11.1
@@ -106,6 +107,7 @@ cpio копіює файли в або з архіву cpio або tar, який
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__gettextize}
diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644 (file)
index 0000000..9c7d7ed
--- /dev/null
@@ -0,0 +1,27 @@
+From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Mon, 20 Jan 2020 07:45:39 +0200
+Subject: Minor fix * src/global.c: Remove superfluous declaration of
+ program_name
+
+---
+ src/global.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/global.c b/src/global.c
+index fb3abe9..acf92bc 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
+ /* Extract to standard output? */
+ bool to_stdout_option = false;
+-/* The name this program was run with.  */
+-char *program_name;
+-
+ /* A pointer to either lstat or stat, depending on whether
+    dereferencing of symlinks is done for input files.  */
+ int (*xstat) ();
+-- 
+cgit v1.2.1
+
This page took 0.197606 seconds and 4 git commands to generate.