diff options
author | Florian Franzmann | 2020-07-26 12:35:48 +0200 |
---|---|---|
committer | Florian Franzmann | 2020-07-26 12:35:48 +0200 |
commit | 9d7decdf53a7496d47c6160bd5010b925bc9a803 (patch) | |
tree | 129cfab5910d2d3b81cb3521bed4967ac149d248 /archive | |
parent | c873f76f2138653bcb5c6fc722421160854b021a (diff) |
archive/cpio: fix compilation with gcc 10
Diffstat (limited to 'archive')
-rw-r--r-- | archive/cpio/HISTORY | 4 | ||||
-rwxr-xr-x | archive/cpio/PRE_BUILD | 5 | ||||
-rw-r--r-- | archive/cpio/cpio-2.12-gcc-10.patch | 27 |
3 files changed, 36 insertions, 0 deletions
diff --git a/archive/cpio/HISTORY b/archive/cpio/HISTORY index 96f0039a3f..9797061ba8 100644 --- a/archive/cpio/HISTORY +++ b/archive/cpio/HISTORY @@ -1,3 +1,7 @@ +2020-07-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, cpio-2.12-gcc-10.patch: apply patch from gentoo to fix + compilation with gcc 10 + 2019-11-06 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.13 SECURITY_PATCH=1 fix CVE-2015-1197, CVE-2016-2037, CVE-2019-14866 diff --git a/archive/cpio/PRE_BUILD b/archive/cpio/PRE_BUILD new file mode 100755 index 0000000000..9f17c3c0db --- /dev/null +++ b/archive/cpio/PRE_BUILD @@ -0,0 +1,5 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && + +patch -p1 < "$SPELL_DIRECTORY/cpio-2.12-gcc-10.patch" + diff --git a/archive/cpio/cpio-2.12-gcc-10.patch b/archive/cpio/cpio-2.12-gcc-10.patch new file mode 100644 index 0000000000..9c7d7edd88 --- /dev/null +++ b/archive/cpio/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 + |