commit: 315b686a24f295f0f2ead134bed94f069da9d93a
Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 8 18:44:49 2025 +0000
Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org>
CommitDate: Tue Jul 8 18:54:39 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315b686a
sys-devel/dev86: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org>
sys-devel/dev86/files/dev86-0.16.19-fortify.patch | 23 ------
sys-devel/dev86/files/dev86-0.16.21-make.patch | 82 ----------------------
.../dev86-0.16.21-non-void-return-clang.patch | 15 ----
...0.16.21-void-return-check-msdos-clang-fix.patch | 20 ------
sys-devel/dev86/files/dev86-pic.patch | 20 ------
5 files changed, 160 deletions(-)
diff --git a/sys-devel/dev86/files/dev86-0.16.19-fortify.patch
b/sys-devel/dev86/files/dev86-0.16.19-fortify.patch
deleted file mode 100644
index 366808c96d20..000000000000
--- a/sys-devel/dev86/files/dev86-0.16.19-fortify.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- dev86-0.16.19/bcc/bcc.c
-+++ dev86-0.16.19/bcc/bcc.c
-@@ -596,12 +597,17 @@
- }
- }
-
--void
--command_reset()
--{
- #ifndef MAXPATHLEN
-+#ifdef PATH_MAX
-+#define MAXPATHLEN PATH_MAX
-+#else
- #define MAXPATHLEN 1024
- #endif
-+#endif
-+
-+void
-+command_reset()
-+{
- char buf[MAXPATHLEN];
- char ** prefix;
- char * saved_cmd;
diff --git a/sys-devel/dev86/files/dev86-0.16.21-make.patch
b/sys-devel/dev86/files/dev86-0.16.21-make.patch
deleted file mode 100644
index 248ff5814dbc..000000000000
--- a/sys-devel/dev86/files/dev86-0.16.21-make.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From f14f78efcd5c865b470173dc06959c8de61e9711 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]>
-Date: Thu, 8 Mar 2018 19:31:17 +0100
-Subject: [PATCH] build: Always use $(MAKE) to spawn sub-make
-
-Always use $(MAKE) instead of literal 'make' to spawn the correct make
-variant. Otherwise, e.g. when using 'gmake' on FreeBSD the Makefiles
-spawn BSD make and things fail because of incompatible MAKEFLAGS
-set by GNU make.
----
- bootblocks/Makefile | 10 +++++-----
- libbsd/Makefile | 2 +-
- makefile.in | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/bootblocks/Makefile b/bootblocks/Makefile
-index d954ea1..2887d86 100644
---- a/bootblocks/Makefile
-+++ b/bootblocks/Makefile
-@@ -55,31 +55,31 @@ fs_min.o: minix.h
-
- bootfile.sys: $(MSRC) $(MINC)
- @rm -f $(MOBJ)
-- make 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out
-+ $(MAKE) 'CFLAGS=$(CFLAGS) -DDOSFLOPPY' monitor.out
- mv monitor.out bootfile.sys
- @rm -f $(MOBJ)
-
- boottar.sys: $(MSRC) $(MINC) tarboot.bin
- @rm -f $(MOBJ)
-- make 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out
-+ $(MAKE) 'CFLAGS=$(CFLAGS) -DTARFLOPPY' monitor.out
- mv monitor.out boottar.sys
- @rm -f $(MOBJ)
-
- bootminix.sys: $(MSRC) $(MINC) minix.bin
- @rm -f $(MOBJ)
-- make 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out
-+ $(MAKE) 'CFLAGS=$(CFLAGS) -DMINFLOPPY' monitor.out
- mv monitor.out bootminix.sys
- @rm -f $(MOBJ)
-
- monitor.sys: $(MSRC) $(MINC)
- @rm -f $(MOBJ)
-- make monitor.out
-+ $(MAKE) monitor.out
- mv monitor.out monitor.sys
- @rm -f $(MOBJ)
-
- monitor: $(MSRC) $(MINC)
- @rm -f $(MOBJ)
-- make 'CFLAGS=-ansi $(DEFS)' monitor.out
-+ $(MAKE) 'CFLAGS=-ansi $(DEFS)' monitor.out
- mv monitor.out monitor
- @rm -f $(MOBJ)
-
-diff --git a/libbsd/Makefile b/libbsd/Makefile
-index 2b29f72..722b86d 100644
---- a/libbsd/Makefile
-+++ b/libbsd/Makefile
-@@ -29,7 +29,7 @@ install: all
- install -m 644 $(LIBBSD) $(LIBDIR)/i86
-
- tests: dummy
-- make -C tests
-+ $(MAKE) -C tests
-
- $(LIBBSD): $(OBJS)
- $(AR) rc $(LIBBSD) $(OBJS)
-diff --git a/makefile.in b/makefile.in
-index b586da1..97ea519 100644
---- a/makefile.in
-+++ b/makefile.in
-@@ -326,7 +326,7 @@ config: ;
- #endif
-
- makec:
-- echo 'cd $$1 ; shift ; make "$$@"' > makec
-+ echo 'cd $$1 ; shift ; $(MAKE) "$$@"' > makec
- chmod +x makec
-
- versions: bcc/version.h
diff --git a/sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch
b/sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch
deleted file mode 100644
index cb42e5707dcf..000000000000
--- a/sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Return void properly, else clang aborts with
-* tok_io.c:231:6: error: non-void function 'do_control' should return a value
[-Wreturn-type]
-See also: https://bugs.gentoo.org/show_bug.cgi?id=523096
-
---- dev86-0.16.21/unproto/tok_io.c
-+++ dev86-0.16.21/unproto/tok_io.c
-@@ -189,7 +189,7 @@
-
- /* do_control - parse control line */
-
--static int do_control()
-+static void do_control()
- {
- struct token *t;
- int line;
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
deleted file mode 100644
index 39e3a1296c21..000000000000
---
a/sys-devel/dev86/files/dev86-0.16.21-void-return-check-msdos-clang-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 */
diff --git a/sys-devel/dev86/files/dev86-pic.patch
b/sys-devel/dev86/files/dev86-pic.patch
deleted file mode 100644
index 23158d188b02..000000000000
--- a/sys-devel/dev86/files/dev86-pic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dev86-0.16.21/elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100
-+++ dev86-0.16.21/elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100
-@@ -129,8 +129,17 @@
- static inline int vm86_mine(struct vm86_struct* v86)
- {
- int __res;
-+#ifndef __PIC__
- __asm__ __volatile__("int $0x80\n"
- :"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86));
-+#else
-+ __asm__ __volatile__(
-+ "movl %%ebx,%%ecx\n\t"
-+ "movl %2,%%ebx\n\t"
-+ "int $0x80\n\t"
-+ "movl %%ecx,%%ebx\n\t"
-+ :"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx");
-+#endif
- return __res;
- }
- #endif
