Mesa (master): GNU/Hurd fixes

Dan Nicholson dbn at kemper.freedesktop.org
Sat Apr 25 02:10:14 UTC 2009


Module: Mesa
Branch: master
Commit: d18dd6ad11268c7a6c2835f4f5fa999c735da300
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d18dd6ad11268c7a6c2835f4f5fa999c735da300

Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Thu Apr 23 05:43:22 2009 -0700

GNU/Hurd fixes

Here is a couple of fixes for GNU/Hurd:
- dri_interface.h: no libdrm support either.
- configure.ac:
 - GNU/Hurd is a GNU OS with _GNU_SOURCE and PTHREADS.
 - GNU needs a couple of flags like other OSes

Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>

---

 configure.ac                        |    6 +++++-
 include/GL/internal/dri_interface.h |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8412cdc..7b07f0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,7 @@ dnl Compiler macros
 DEFINES=""
 AC_SUBST([DEFINES])
 case "$host_os" in
-linux*|*-gnu*)
+linux*|*-gnu*|gnu*)
     DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS"
     ;;
 solaris*)
@@ -742,6 +742,10 @@ if test "$mesa_driver" = dri; then
                 unichrome savage sis swrast"
         fi
         ;;
+    gnu*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"
+	;;
     solaris*)
         DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
         DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index bfa8a33..910c916 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -41,7 +41,7 @@
 #define DRI_INTERFACE_H
 
 /* For archs with no drm.h */
-#if !defined(__APPLE__) && !defined(__CYGWIN__)
+#if !defined(__APPLE__) && !defined(__CYGWIN__) && !defined(__GNU__)
 #include <drm.h>
 #else
 typedef unsigned int drm_context_t;




More information about the mesa-commit mailing list