From c9a5da79c40937e2cf8d91e9a8ea0e4d4c4d5329 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= Date: Mon, 27 Jan 2020 18:44:56 -0500 Subject: [PATCH] net-fs/davfs2: fix building with gcc 10 #706356 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/706356 Bug: http://savannah.nongnu.org/support/index.php?110186 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Göktürk Yüksek --- net-fs/davfs2/davfs2-1.5.5.ebuild | 5 ++++- net-fs/davfs2/files/davfs2-1.5.5-gcc-10.patch | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 net-fs/davfs2/files/davfs2-1.5.5-gcc-10.patch diff --git a/net-fs/davfs2/davfs2-1.5.5.ebuild b/net-fs/davfs2/davfs2-1.5.5.ebuild index 3ef5dd25f003..e90fe83a11dd 100644 --- a/net-fs/davfs2/davfs2-1.5.5.ebuild +++ b/net-fs/davfs2/davfs2-1.5.5.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 @@ -33,6 +33,9 @@ src_prepare() { sed -e '/^manual[58]_DATA/ s/\.gz//g' \ -i "${S}"/man/Makefile.in || die + # Bug: https://bugs.gentoo.org/706356 + eapply "${FILESDIR}"/${PN}-1.5.5-gcc-10.patch + default } diff --git a/net-fs/davfs2/files/davfs2-1.5.5-gcc-10.patch b/net-fs/davfs2/files/davfs2-1.5.5-gcc-10.patch new file mode 100644 index 000000000000..56b0bab44918 --- /dev/null +++ b/net-fs/davfs2/files/davfs2-1.5.5-gcc-10.patch @@ -0,0 +1,18 @@ +Handle building with '-fno-common' for gcc 10. +See: https://bugs.gentoo.org/706356 + + +--- a/src/dav_coda.c ++++ b/src/dav_coda.c +@@ -99,3 +99,3 @@ static size_t alignment; + /* Send debug messages to syslog if != 0. */ +-int debug; ++static int debug; + +--- a/src/dav_fuse.c ++++ b/src/dav_fuse.c +@@ -86,3 +86,3 @@ static uint64_t root; + /* Send debug messages to syslog if != 0. */ +-int debug; ++static int debug; + -- 2.26.2