[X2Go-Commits] [nx-libs] 204/429: Mesa: make compilation with work with musl

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 8b6d454cf5606540ab23ce7479631f4f09af6d34
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Jan 4 20:41:32 2021 +0100

    Mesa: make compilation with work with musl
    
    Fixes ArcticaProject/nx-lib#975
---
 nx-X11/extras/Mesa.patches_6.4.2/1001_support_musl | 12 ++++++++++++
 nx-X11/extras/Mesa.patches_6.4.2/series            |  1 +
 2 files changed, 13 insertions(+)

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

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git