summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-02-18 20:46:27 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2020-02-18 20:46:27 +0000
commitd78585ef0dc6ded24811254595ea3741f196bc46 (patch)
tree336533fb0eb9ab4db103ef994861a40b25718f53
parentmedia-gfx/nvidia-cg-toolkit: drop old pkg_postinst(), bug #705258 (diff)
downloadgentoo-d78585ef0dc6ded24811254595ea3741f196bc46.tar.gz
gentoo-d78585ef0dc6ded24811254595ea3741f196bc46.tar.bz2
gentoo-d78585ef0dc6ded24811254595ea3741f196bc46.zip
app-arch/cpio: backport tweak for gcc-10, bug #705900
Closes: https://bugs.gentoo.org/705900 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--app-arch/cpio/cpio-2.12-r1.ebuild1
-rw-r--r--app-arch/cpio/cpio-2.13.ebuild3
-rw-r--r--app-arch/cpio/files/cpio-2.12-gcc-10.patch27
3 files changed, 30 insertions, 1 deletions
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index a32dcef968d..2c74b76cbc1 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -17,6 +17,7 @@ IUSE="nls"
src_prepare() {
epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
+ epatch "${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
}
src_configure() {
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild
index 30557dbd043..4f5966691a5 100644
--- a/app-arch/cpio/cpio-2.13.ebuild
+++ b/app-arch/cpio/cpio-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,6 +14,7 @@ IUSE="nls"
PATCHES=(
"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+ "${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
)
src_configure() {
diff --git a/app-arch/cpio/files/cpio-2.12-gcc-10.patch b/app-arch/cpio/files/cpio-2.12-gcc-10.patch
new file mode 100644
index 00000000000..9c7d7edd88f
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.12-gcc-10.patch
@@ -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
+