diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:28:13 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:28:13 +0100 |
| commit | f60ac577713c28212cdf2f4203b2cc0726034f5f (patch) | |
| tree | 78966db9d151cdadc0d8f97f97d5cb16604fe7c2 | |
| parent | 8c3bb27150bf058c007af1318cb477e9763b9d9d (diff) | |
| parent | 46c9c493f083ef180c690533eef218eb82684eaa (diff) | |
| download | nx-libs-f60ac577713c28212cdf2f4203b2cc0726034f5f.tar.gz nx-libs-f60ac577713c28212cdf2f4203b2cc0726034f5f.tar.bz2 nx-libs-f60ac577713c28212cdf2f4203b2cc0726034f5f.zip | |
Merge branch 'uli42-pr/musl_fixes' into 3.6.x
Attributes GH PR #982: https://github.com/ArcticaProject/nx-libs/pull/982
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.2/1001_support_musl | 12 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.2/series | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xf86bigfont.c | 1 |
3 files changed, 14 insertions, 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 new file mode 100644 index 000000000..72b8d90bd --- /dev/null +++ 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 index 4e6c15934..db40c2b60 100644 --- 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 index 352e40261..a31ffd02c 100644 --- 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> |