| 1 |
commit: e47ebc6c160cad1de9f7484eabb0bd750d00d0e1 |
| 2 |
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 1 10:28:10 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 1 10:28:38 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47ebc6c |
| 7 |
|
| 8 |
app-misc/fdutils: Fix build with gcc-10 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706822 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org> |
| 13 |
|
| 14 |
app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild | 4 +++- |
| 15 |
app-misc/fdutils/fdutils-5.5.20060227.ebuild | 4 +++- |
| 16 |
.../fdutils/files/fdutils-5.5.20060227-gcc10.patch | 20 ++++++++++++++++++++ |
| 17 |
3 files changed, 26 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild |
| 20 |
index d234389a9e1..b0196c0d391 100644 |
| 21 |
--- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild |
| 22 |
+++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2021 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=5 |
| 29 |
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND} |
| 30 |
S=${WORKDIR}/${PN}-5.5-20060227 |
| 31 |
|
| 32 |
src_prepare() { |
| 33 |
+ epatch "${FILESDIR}/${P}-gcc10.patch" |
| 34 |
+ |
| 35 |
local d="${WORKDIR}"/debian/patches |
| 36 |
EPATCH_SOURCE="${d}" epatch $(<"${d}"/series) |
| 37 |
sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721 |
| 38 |
|
| 39 |
diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild |
| 40 |
index 1116db851a7..632a26a8982 100644 |
| 41 |
--- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild |
| 42 |
+++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild |
| 43 |
@@ -1,4 +1,4 @@ |
| 44 |
-# Copyright 1999-2018 Gentoo Foundation |
| 45 |
+# Copyright 1999-2021 Gentoo Authors |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
EAPI=5 |
| 49 |
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND} |
| 50 |
S=${WORKDIR}/${PN}-5.5-20060227 |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
+ epatch "${FILESDIR}/${P}-gcc10.patch" |
| 54 |
+ |
| 55 |
local d="${WORKDIR}"/debian/patches |
| 56 |
EPATCH_SOURCE="${d}" epatch $(<"${d}"/series) |
| 57 |
sed -i -e 's:{LDFLAFS}:(LDFLAGS):' src/Makefile.in || die #337721 |
| 58 |
|
| 59 |
diff --git a/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch |
| 60 |
new file mode 100644 |
| 61 |
index 00000000000..2bda41e1125 |
| 62 |
--- /dev/null |
| 63 |
+++ b/app-misc/fdutils/files/fdutils-5.5.20060227-gcc10.patch |
| 64 |
@@ -0,0 +1,20 @@ |
| 65 |
+Description: Fix ftbfs with GCC-10 |
| 66 |
+ |
| 67 |
+Author: Sudip Mukherjee <sudipm.mukherjee@×××××.com> |
| 68 |
+Bug-Debian: https://bugs.debian.org/957200 |
| 69 |
+Forwarded: no |
| 70 |
+ |
| 71 |
+--- |
| 72 |
+ |
| 73 |
+--- fdutils-5.5-20060227.orig/src/superformat.h |
| 74 |
++++ fdutils-5.5-20060227/src/superformat.h |
| 75 |
+@@ -97,7 +97,7 @@ int compute_all_sequences(struct params |
| 76 |
+ void compute_track0_sequence(struct params *fd); |
| 77 |
+ int calc_skews(struct params *fd0, struct params *fd, int n); |
| 78 |
+ extern int verbosity; |
| 79 |
+-int header_size; |
| 80 |
+-int index_size; |
| 81 |
++extern int header_size; |
| 82 |
++extern int index_size; |
| 83 |
+ |
| 84 |
+ #endif |
Archives