Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
Date: Sun, 06 Sep 2020 05:55:37
Message-Id: 1599371717.d898cc0eff0b92fb6ab034dcfc0a9b50dee2d59d.juippis@gentoo
1 commit: d898cc0eff0b92fb6ab034dcfc0a9b50dee2d59d
2 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
3 AuthorDate: Sat Sep 5 13:28:29 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 6 05:55:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d898cc0e
7
8 dev-games/irrlicht: Add patch to remove sys/sysctl.h include
9
10 Closes: https://bugs.gentoo.org/736342
11 Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/17426
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 .../files/irrlicht-1.8.4-remove-sys-sysctl.h.patch | 38 ++++++++++++++++++++++
16 dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild | 1 +
17 2 files changed, 39 insertions(+)
18
19 diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch
20 new file mode 100644
21 index 00000000000..2e5fc63e6f8
22 --- /dev/null
23 +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch
24 @@ -0,0 +1,38 @@
25 +From 5382142d37730f6758753b758c91e257ffd5892c Mon Sep 17 00:00:00 2001
26 +From: Romain Naour <romain.naour@×××××.com>
27 +Date: Sun, 9 Apr 2017 22:20:19 +0200
28 +Subject: [PATCH] remove sys/sysctl.h
29 +
30 +With musl irrlicht doesn't build due to missing sys/sysctl.h
31 +
32 +fatal error: sys/sysctl.h: No such file or directory
33 +
34 +From [1]
35 +"sysctl does not work, and NEVER worked. using it is bogus.
36 +it was a bogus experimental syscall that was deprecated before
37 +it was ever used (basically, a broken binary version of
38 +/proc/sys, without any stability between kernel versions for
39 +what the binary constants meant)."
40 +
41 +[1] https://devsonacid.wordpress.com/tag/musl/
42 +
43 +Signed-off-by: Romain Naour <romain.naour@×××××.com>
44 +---
45 + source/Irrlicht/COSOperator.cpp | 1 -
46 + 1 file changed, 1 deletion(-)
47 +
48 +diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
49 +index 0899d1d..ccf5ef5 100644
50 +--- a/source/Irrlicht/COSOperator.cpp
51 ++++ b/source/Irrlicht/COSOperator.cpp
52 +@@ -13,7 +13,6 @@
53 + #include <unistd.h>
54 + #ifndef _IRR_SOLARIS_PLATFORM_
55 + #include <sys/types.h>
56 +-#include <sys/sysctl.h>
57 + #endif
58 + #endif
59 +
60 +--
61 +2.9.3
62 +
63
64 diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
65 index 938b141e5e0..8a74c20ddcf 100644
66 --- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
67 +++ b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
68 @@ -33,6 +33,7 @@ PATCHES=(
69 "${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
70 "${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
71 "${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch
72 + "${FILESDIR}/${P}-remove-sys-sysctl.h.patch"
73 )
74
75 DOCS=( changes.txt readme.txt )