Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/dev86/, sys-devel/dev86/files/
Date: Sat, 26 Mar 2022 07:36:28
Message-Id: 1648280180.09a2c0823d2dd32c9000256b48adbf3e93f89afa.juippis@gentoo
1 commit: 09a2c0823d2dd32c9000256b48adbf3e93f89afa
2 Author: Denis Pronin <dannftk <AT> yandex <DOT> ru>
3 AuthorDate: Sat Mar 19 10:17:46 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 26 07:36:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a2c082
7
8 sys-devel/dev86: add clang patch to 0.16.21-r3
9
10 patched bootblocks/makeboot.c of sys-devel/dev86-0.16.21-r3
11
12 Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
13 Closes: https://github.com/gentoo/gentoo/pull/24659
14 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16 sys-devel/dev86/dev86-0.16.21-r3.ebuild | 3 ++-
17 ...6-0.16.21-void-return-check-msdos-clang-fix.patch | 20 ++++++++++++++++++++
18 2 files changed, 22 insertions(+), 1 deletion(-)
19
20 diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
21 index 2af636abe3e1..e3784e658bfb 100644
22 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild
23 +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2021 Gentoo Authors
26 +# Copyright 1999-2022 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=7
30 @@ -22,6 +22,7 @@ PATCHES=(
31 "${FILESDIR}/${PN}-0.16.19-fortify.patch"
32 "${FILESDIR}/${P}-non-void-return-clang.patch"
33 "${FILESDIR}/${PN}-0.16.21-make.patch"
34 + "${FILESDIR}/${P}-void-return-check-msdos-clang-fix.patch"
35 )
36
37 src_prepare() {
38
39 diff --git a/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch
40 new file mode 100644
41 index 000000000000..39e3a1296c21
42 --- /dev/null
43 +++ b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch
44 @@ -0,0 +1,20 @@
45 +--- a/bootblocks/makeboot.c 2020-11-30 00:28:40.383078094 +0300
46 ++++ b/bootblocks/makeboot.c 2020-11-30 00:28:26.969025659 +0300
47 +@@ -183,6 +183,8 @@
48 + unsigned char bpb_flags[100];
49 + int has_bpb_overrides = 0;
50 +
51 ++static void check_msdos();
52 ++
53 + main(argc, argv)
54 + int argc;
55 + char ** argv;
56 +@@ -1122,7 +1124,7 @@
57 +
58 + /**************************************************************************/
59 +
60 +-check_msdos()
61 ++static void check_msdos()
62 + {
63 + decode_super(buffer);
64 + if( dosflds[DOS_CLUST].value == 0 ) /* MSDOS v1.0 */