1 |
commit: d78585ef0dc6ded24811254595ea3741f196bc46 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 18 20:46:27 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 18 20:46:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d78585ef |
7 |
|
8 |
app-arch/cpio: backport tweak for gcc-10, bug #705900 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/705900 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
13 |
|
14 |
app-arch/cpio/cpio-2.12-r1.ebuild | 1 + |
15 |
app-arch/cpio/cpio-2.13.ebuild | 3 ++- |
16 |
app-arch/cpio/files/cpio-2.12-gcc-10.patch | 27 +++++++++++++++++++++++++++ |
17 |
3 files changed, 30 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild |
20 |
index a32dcef968d..2c74b76cbc1 100644 |
21 |
--- a/app-arch/cpio/cpio-2.12-r1.ebuild |
22 |
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild |
23 |
@@ -17,6 +17,7 @@ IUSE="nls" |
24 |
src_prepare() { |
25 |
epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295 |
26 |
epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428 |
27 |
+ epatch "${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900 |
28 |
} |
29 |
|
30 |
src_configure() { |
31 |
|
32 |
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild |
33 |
index 30557dbd043..4f5966691a5 100644 |
34 |
--- a/app-arch/cpio/cpio-2.13.ebuild |
35 |
+++ b/app-arch/cpio/cpio-2.13.ebuild |
36 |
@@ -1,4 +1,4 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
+# Copyright 1999-2020 Gentoo Authors |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
|
41 |
EAPI=7 |
42 |
@@ -14,6 +14,7 @@ IUSE="nls" |
43 |
|
44 |
PATCHES=( |
45 |
"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295 |
46 |
+ "${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900 |
47 |
) |
48 |
|
49 |
src_configure() { |
50 |
|
51 |
diff --git a/app-arch/cpio/files/cpio-2.12-gcc-10.patch b/app-arch/cpio/files/cpio-2.12-gcc-10.patch |
52 |
new file mode 100644 |
53 |
index 00000000000..9c7d7edd88f |
54 |
--- /dev/null |
55 |
+++ b/app-arch/cpio/files/cpio-2.12-gcc-10.patch |
56 |
@@ -0,0 +1,27 @@ |
57 |
+From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001 |
58 |
+From: Sergey Poznyakoff <gray@×××.org> |
59 |
+Date: Mon, 20 Jan 2020 07:45:39 +0200 |
60 |
+Subject: Minor fix * src/global.c: Remove superfluous declaration of |
61 |
+ program_name |
62 |
+ |
63 |
+--- |
64 |
+ src/global.c | 3 --- |
65 |
+ 1 file changed, 3 deletions(-) |
66 |
+ |
67 |
+diff --git a/src/global.c b/src/global.c |
68 |
+index fb3abe9..acf92bc 100644 |
69 |
+--- a/src/global.c |
70 |
++++ b/src/global.c |
71 |
+@@ -184,9 +184,6 @@ unsigned int warn_option = 0; |
72 |
+ /* Extract to standard output? */ |
73 |
+ bool to_stdout_option = false; |
74 |
+ |
75 |
+-/* The name this program was run with. */ |
76 |
+-char *program_name; |
77 |
+- |
78 |
+ /* A pointer to either lstat or stat, depending on whether |
79 |
+ dereferencing of symlinks is done for input files. */ |
80 |
+ int (*xstat) (); |
81 |
+-- |
82 |
+cgit v1.2.1 |
83 |
+ |