summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-02-06 11:27:11 +0100
committerDavid Seifert <soap@gentoo.org>2016-02-06 11:27:25 +0100
commit0a4ee8dccd9422cdc4a507c5bdd360be4802f8fd (patch)
treeeb226abdb33908c58fe9385316d41b951cbc9a2b /sys-devel/dev86/files
parentMerge remote-tracking branch 'github/pr/790'. (diff)
downloadgentoo-0a4ee8dccd9422cdc4a507c5bdd360be4802f8fd.tar.gz
gentoo-0a4ee8dccd9422cdc4a507c5bdd360be4802f8fd.tar.bz2
gentoo-0a4ee8dccd9422cdc4a507c5bdd360be4802f8fd.zip
sys-devel/dev86: Include patch for building with clang
Gentoo-Bug: 523096 * EAPI=6 * Amend patches for -p1 * Thanks Fabio Scaccabarozzi for the patch Package-Manager: portage-2.2.27
Diffstat (limited to 'sys-devel/dev86/files')
-rw-r--r--sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch15
-rw-r--r--sys-devel/dev86/files/dev86-pic.patch4
2 files changed, 17 insertions, 2 deletions
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
new file mode 100644
index 00000000000..cb42e5707dc
--- /dev/null
+++ b/sys-devel/dev86/files/dev86-0.16.21-non-void-return-clang.patch
@@ -0,0 +1,15 @@
+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-pic.patch b/sys-devel/dev86/files/dev86-pic.patch
index 439c2648b7d..23158d188b0 100644
--- a/sys-devel/dev86/files/dev86-pic.patch
+++ b/sys-devel/dev86/files/dev86-pic.patch
@@ -1,5 +1,5 @@
---- elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100
-+++ elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100
+--- 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)
{