Merge branch 'uli42-pr/musl_fixes' into 3.6.x

Attributes GH PR #982: #982
ArcticaProject · Jan 15, 2021 · f60ac57 · f60ac57
2 parents 8c3bb27 + 46c9c49
commit f60ac57
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/nx-X11/extras/Mesa.patches_6.4.2/1001_support_musl b/nx-X11/extras/Mesa.patches_6.4.2/1001_support_musl
@@ -0,0 +1,12 @@
+make compilation work on any non-linux glibc system. See ArcticaProject/nx-libs#975
+--- a/src/mesa/main/glheader.h
++++ b/src/mesa/main/glheader.h
+@@ -62,7 +62,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#if defined(__linux__) && defined(__i386__)
++#if defined(__GLIBC__) && defined(__i386__)
+ #include <fpu_control.h>
+ #endif
+ #endif
diff --git a/nx-X11/extras/Mesa.patches_6.4.2/series b/nx-X11/extras/Mesa.patches_6.4.2/series
@@ -5,3 +5,4 @@
 5001_nasty-typo-fixes.patch
 4005_adapt-all-libX11-include-paths-to-libNX_X11.patch
 5002_silence-uninitialized.diff
+1001_support_musl
diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
@@ -46,6 +46,7 @@
    Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
    PAGE_SIZE. It is defined in <asm/page.h>. */
 #include <asm/page.h>
+#include <limits.h>
 #endif
 #ifdef SVR4
 #include <sys/sysmacros.h>