From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1155823-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 92145138350
for <garchives@archives.gentoo.org>; Thu, 26 Mar 2020 09:22:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D9F66E0C4D;
Thu, 26 Mar 2020 09:22:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A5F29E0C48
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Mar 2020 09:22:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D544934FA1A
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Mar 2020 09:22:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E578195
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Mar 2020 09:22:19 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1585214516.e1b706046abcfd31c9ecd1e950a185c5cbf6068d.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/, sys-apps/heirloom-tools/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
X-VCS-Directories: sys-apps/heirloom-tools/ sys-apps/heirloom-tools/files/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: e1b706046abcfd31c9ecd1e950a185c5cbf6068d
X-VCS-Branch: master
Date: Thu, 26 Mar 2020 09:22:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 8dc9b694-0d41-4f33-9d4d-0f8e97b59bf7
X-Archives-Hash: eb5d04460162df1a040365c35144bee1
commit: e1b706046abcfd31c9ecd1e950a185c5cbf6068d
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Thu Mar 26 09:21:56 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 09:21:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b70604
sys-apps/heirloom-tools: fix build with -fno-common
Closes: https://bugs.gentoo.org/707218
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/heirloom-tools-070715-gcc-10.patch | 105 +++++++++++++++++++++
.../heirloom-tools/heirloom-tools-070715-r1.ebuild | 1 +
2 files changed, 106 insertions(+)
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
new file mode 100644
index 00000000000..38de3216085
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
@@ -0,0 +1,105 @@
+--- a/cpio/cpio.c
++++ b/cpio/cpio.c
+@@ -748,6 +748,7 @@ static struct stat globst;
+ */
+ #define SANELIMIT 0177777
+
++enum fmttype fmttype;
+ char *progname; /* argv[0] to main() */
+ static struct dslot *devices; /* devices table */
+ static struct dslot *markeddevs; /* unusable device numbers */
+@@ -826,6 +827,9 @@ static int compressed_bar; /* this is a compressed bar archive */
+ static int formatforced; /* -k -i -Hfmt forces a format */
+ static long long lineno; /* input line number */
+
++enum pax pax;
++enum pax_preserve pax_preserve;
++
+ int pax_dflag; /* directory matches only itself */
+ int pax_kflag; /* do not overwrite files */
+ int pax_nflag; /* select first archive member only */
+--- a/cpio/cpio.h
++++ b/cpio/cpio.h
+@@ -31,7 +31,7 @@
+ #include <sys/stat.h>
+ #include <inttypes.h>
+
+-enum {
++enum fmttype {
+ FMT_NONE = 00000000, /* no format chosen yet */
+
+ TYP_PAX = 00000010, /* uses pax-like extended headers */
+@@ -70,7 +70,8 @@ enum {
+ FMT_BAR = 00400001, /* bar format type */
+
+ FMT_ZIP = 01000000 /* zip format */
+-} fmttype;
++};
++extern enum fmttype fmttype;
+
+ /*
+ * Zip compression method.
+@@ -173,11 +174,12 @@ extern int printsev;
+ extern char *progname;
+ extern struct glist *patterns;
+
+-enum { /* type of pax command this is */
++enum pax { /* type of pax command this is */
+ PAX_TYPE_CPIO = 0, /* not a pax command */
+ PAX_TYPE_PAX1992 = 1, /* POSIX.2 pax command */
+ PAX_TYPE_PAX2001 = 2 /* POSIX.1-2001 pax command */
+-} pax;
++};
++extern enum pax pax;
+ extern int pax_dflag;
+ extern int pax_kflag;
+ extern int pax_nflag;
+@@ -185,14 +187,15 @@ extern int pax_sflag;
+ extern int pax_uflag;
+ extern int pax_Xflag;
+
+-enum {
++enum pax_preserve {
+ PAX_P_NONE = 0000,
+ PAX_P_ATIME = 0001,
+ PAX_P_MTIME = 0004,
+ PAX_P_OWNER = 0010,
+ PAX_P_MODE = 0020,
+ PAX_P_EVERY = 0400
+-} pax_preserve;
++};
++extern enum pax_preserve pax_preserve;
+
+ extern size_t (*ofiles)(char **, size_t *);
+ extern void (*prtime)(time_t);
+--- a/tabs/tabspec.c
++++ b/tabs/tabspec.c
+@@ -36,6 +36,8 @@
+ #include <blank.h>
+ #include "tabspec.h"
+
++enum taberrno taberrno;
++
+ static const struct {
+ const char *c_nam;
+ const char *c_str;
+--- a/tabs/tabspec.h
++++ b/tabs/tabspec.h
+@@ -34,14 +34,15 @@ struct tabulator {
+ int t_rep; /* repetitive tab count */
+ };
+
+-enum {
++enum taberrno {
+ TABERR_NONE,
+ TABERR_CANTOP, /* can't open */
+ TABERR_FILIND, /* file indirection */
+ TABERR_UNKTAB, /* unknown tab code */
+ TABERR_ILLINC, /* illegal increment */
+ TABERR_ILLTAB /* illegal tabs */
+-} taberrno;
++};
++extern enum taberrno taberrno;
+
+ extern void *scalloc(size_t nmemb, size_t size);
+ extern struct tabulator *tabstops(const char *s, int cols);
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
index 26da82f5c8b..b3b27bdab68 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-major.patch
"${FILESDIR}"/${P}-glibc-2.30.patch
"${FILESDIR}"/${P}-glibc-2.31.patch
+ "${FILESDIR}"/${P}-gcc-10.patch
)
# slightly broken