Merge pull request #2405 from pullmoll/xonotic

xonotic: unbreak musl
This commit is contained in:
Enno Boland 2015-08-30 09:38:36 +02:00
commit aee4f5eedb
2 changed files with 14 additions and 1 deletions

View file

@ -0,0 +1,13 @@
There is no moncontrol() in musl libc.
--- source/darkplaces/sys_shared.c 2015-01-13 19:56:16.000000000 +0100
+++ source/darkplaces/sys_shared.c 2015-08-30 09:24:54.839064473 +0200
@@ -69,7 +69,7 @@
else
moncleanup();
#endif
-#elif defined(__linux__) || defined(__FreeBSD__)
+#elif (defined(__linux__) && defined(__GLIBC__)) || defined(__FreeBSD__)
extern int moncontrol(int);
moncontrol(enable);
#endif

View file

@ -1,7 +1,7 @@
# Template file for 'xonotic' # Template file for 'xonotic'
pkgname=xonotic pkgname=xonotic
version=0.8.1 version=0.8.1
revision=1 revision=2
wrksrc="Xonotic" wrksrc="Xonotic"
homepage="http://xonotic.org" homepage="http://xonotic.org"
license="GPL-2, GPL-3" license="GPL-2, GPL-3"