Skip to content

Commit f60ac57

Browse files
committed
Merge branch 'uli42-pr/musl_fixes' into 3.6.x
Attributes GH PR #982: #982
2 parents 8c3bb27 + 46c9c49 commit f60ac57

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
make compilation work on any non-linux glibc system. See ArcticaProject/nx-libs#975
2+
--- a/src/mesa/main/glheader.h
3+
+++ b/src/mesa/main/glheader.h
4+
@@ -62,7 +62,7 @@
5+
#include <stdlib.h>
6+
#include <stdio.h>
7+
#include <string.h>
8+
-#if defined(__linux__) && defined(__i386__)
9+
+#if defined(__GLIBC__) && defined(__i386__)
10+
#include <fpu_control.h>
11+
#endif
12+
#endif

nx-X11/extras/Mesa.patches_6.4.2/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
5001_nasty-typo-fixes.patch
66
4005_adapt-all-libX11-include-paths-to-libNX_X11.patch
77
5002_silence-uninitialized.diff
8+
1001_support_musl

nx-X11/programs/Xserver/Xext/xf86bigfont.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
4747
PAGE_SIZE. It is defined in <asm/page.h>. */
4848
#include <asm/page.h>
49+
#include <limits.h>
4950
#endif
5051
#ifdef SVR4
5152
#include <sys/sysmacros.h>

0 commit comments

Comments
 (0)