From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 0BDFA138359 for ; Tue, 11 Aug 2020 14:38:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E1AEE083B; Tue, 11 Aug 2020 14:38:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 39166E083B for ; Tue, 11 Aug 2020 14:38:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5455A34F23F for ; Tue, 11 Aug 2020 14:38:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBBAE26 for ; Tue, 11 Aug 2020 14:38:12 +0000 (UTC) From: "Naohiro Aota" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Naohiro Aota" Message-ID: <1597156633.7167133559531f56754e11d42e1d1873154fa21b.naota@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/global/files/, dev-util/global/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/global/files/global-6.6.4-fno-common.patch dev-util/global/global-6.6.4.ebuild X-VCS-Directories: dev-util/global/files/ dev-util/global/ X-VCS-Committer: naota X-VCS-Committer-Name: Naohiro Aota X-VCS-Revision: 7167133559531f56754e11d42e1d1873154fa21b X-VCS-Branch: master Date: Tue, 11 Aug 2020 14:38:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 939bcd47-7c25-4903-a046-fc16ce6fde39 X-Archives-Hash: b2cee685fc005de68a455bde66e92610 commit: 7167133559531f56754e11d42e1d1873154fa21b Author: Naohiro Aota gentoo org> AuthorDate: Tue Aug 11 14:03:54 2020 +0000 Commit: Naohiro Aota gentoo org> CommitDate: Tue Aug 11 14:37:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71671335 dev-util/global: add patch to build with gcc-10/-fno-common Closes: https://bugs.gentoo.org/706890 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Naohiro Aota gentoo.org> .../global/files/global-6.6.4-fno-common.patch | 44 ++++++++++++++++++++++ dev-util/global/global-6.6.4.ebuild | 7 +++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dev-util/global/files/global-6.6.4-fno-common.patch b/dev-util/global/files/global-6.6.4-fno-common.patch new file mode 100644 index 00000000000..5a85cc12568 --- /dev/null +++ b/dev-util/global/files/global-6.6.4-fno-common.patch @@ -0,0 +1,44 @@ +--- a/libutil/args.c ++++ b/libutil/args.c +@@ -39,7 +39,7 @@ + #define ARGS_GFIND 3 + #define ARGS_BOTH 4 + +-int type; ++static int type; + const char **argslist; + FILE *ip; + GFIND *gp; +--- a/libutil/convert.c ++++ b/libutil/convert.c +@@ -46,7 +46,7 @@ + + #include "convert.h" + static int debug = 0; +-int flags; ++static int flags; + + /** + * This module converts records before output. +--- a/libutil/gpathop.c ++++ b/libutil/gpathop.c +@@ -49,7 +49,7 @@ + static int opened; + static int created; + +-int openflags; ++static int openflags; + void + set_gpath_flags(int flags) { + openflags = flags; +--- a/libutil/version.c ++++ b/libutil/version.c +@@ -30,7 +30,7 @@ + #endif + #include "version.h" + +-const char *copy = "\ ++static const char *copy = "\ + Copyright (c) %s Tama Communications Corporation\n\ + License GPLv3+: GNU GPL version 3 or later \n\ + This is free software; you are free to change and redistribute it.\n\ diff --git a/dev-util/global/global-6.6.4.ebuild b/dev-util/global/global-6.6.4.ebuild index ebb9cd1c3af..48f5dfdc0a9 100644 --- a/dev-util/global/global-6.6.4.ebuild +++ b/dev-util/global/global-6.6.4.ebuild @@ -27,7 +27,7 @@ RDEPEND=" sys-devel/libtool:2 )" -DEPEND="${DEPEND} +DEPEND="${RDEPEND} doc? ( app-text/texi2html sys-apps/texinfo @@ -35,7 +35,10 @@ DEPEND="${DEPEND} SITEFILE="50gtags-gentoo.el" -PATCHES=( "${FILESDIR}/${PN}-6.2.9-tinfo.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-6.2.9-tinfo.patch" + "${FILESDIR}/${PN}-6.6.4-fno-common.patch" +) DOCS=( AUTHORS FAQ NEWS README THANKS )