From 09a2c0823d2dd32c9000256b48adbf3e93f89afa Mon Sep 17 00:00:00 2001 From: Denis Pronin Date: Sat, 19 Mar 2022 13:17:46 +0300 Subject: sys-devel/dev86: add clang patch to 0.16.21-r3 patched bootblocks/makeboot.c of sys-devel/dev86-0.16.21-r3 Signed-off-by: Denis Pronin Closes: https://github.com/gentoo/gentoo/pull/24659 Signed-off-by: Joonas Niilola --- sys-devel/dev86/dev86-0.16.21-r3.ebuild | 3 ++- ...6-0.16.21-void-return-check-msdos-clang-fix.patch | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch diff --git a/sys-devel/dev86/dev86-0.16.21-r3.ebuild b/sys-devel/dev86/dev86-0.16.21-r3.ebuild index 2af636abe3e1..e3784e658bfb 100644 --- a/sys-devel/dev86/dev86-0.16.21-r3.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,6 +22,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.16.19-fortify.patch" "${FILESDIR}/${P}-non-void-return-clang.patch" "${FILESDIR}/${PN}-0.16.21-make.patch" + "${FILESDIR}/${P}-void-return-check-msdos-clang-fix.patch" ) src_prepare() { 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 new file mode 100644 index 000000000000..39e3a1296c21 --- /dev/null +++ b/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch @@ -0,0 +1,20 @@ +--- a/bootblocks/makeboot.c 2020-11-30 00:28:40.383078094 +0300 ++++ b/bootblocks/makeboot.c 2020-11-30 00:28:26.969025659 +0300 +@@ -183,6 +183,8 @@ + unsigned char bpb_flags[100]; + int has_bpb_overrides = 0; + ++static void check_msdos(); ++ + main(argc, argv) + int argc; + char ** argv; +@@ -1122,7 +1124,7 @@ + + /**************************************************************************/ + +-check_msdos() ++static void check_msdos() + { + decode_super(buffer); + if( dosflds[DOS_CLUST].value == 0 ) /* MSDOS v1.0 */ -- cgit v1.2.3-18-g5258