Attachment 41692 Details for Bug 32859 – Fixes for NetBSD support

[patch] Fixes for NetBSD support

mesa-netbsd.diff (text/plain), 2.98 KB, created by Pierre Allegraud on 2011-01-05 14:40:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Allegraud

Created: 2011-01-05 14:40:45 UTC

Size: 2.98 KB

patch

obsolete

>--- configure.ac.orig	2011-01-05 22:19:35.000000000 +0100
>+++ configure.ac	2011-01-05 22:21:47.000000000 +0100
>@@ -377,14 +377,14 @@
>     case "$host_cpu" in
>     i?86)
>         case "$host_os" in
>-        linux* | *freebsd* | dragonfly*)
>+        linux* | *freebsd* | dragonfly* | *netbsd*)
>             test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86
>             ;;
>         esac
>         ;;
>     x86_64)
>         case "$host_os" in
>-        linux* | *freebsd* | dragonfly*)
>+        linux* | *freebsd* | dragonfly* | *netbsd*)
>             test "x$enable_32bit" = xyes && asm_arch=x86 || asm_arch=x86_64
>             ;;
>         esac
>@@ -542,7 +542,7 @@
>     i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
>     esac
>     ;;
>-*freebsd* | dragonfly*)
>+*freebsd* | dragonfly* | *netbsd*)
>     case "$host_cpu" in
>     i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
>     esac
>@@ -909,16 +909,13 @@
>             ;;
>         esac
>         ;;
>-    freebsd* | dragonfly*)
>+    freebsd* | dragonfly* | *netbsd*)
>         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
>         DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
>         DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
>         if test "x$driglx_direct" = xyes; then
>             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
>         fi
>-        if test "x$GXX" = xyes; then
>-            CXXFLAGS="$CXXFLAGS -ansi -pedantic"
>-        fi
> 
>         if test "x$DRI_DIRS" = "xyes"; then
>             DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
>--- bin/mklib.orig	2011-01-05 22:39:15.000000000 +0100
>+++ bin/mklib	2011-01-05 22:41:10.000000000 +0100
>@@ -307,7 +307,7 @@
> #
> case $ARCH in
> 
>-    'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/*)
>+    'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD')
> 	# we assume gcc
> 
> 	if [ "x$LINK" = "x" ] ; then
>@@ -574,20 +574,6 @@
> 	fi
> 	;;
> 
>-    'NetBSD')
>-        if [ $STATIC = 1 ] ; then
>-	    LIBNAME="lib${LIBNAME}_pic.a"
>-	    echo "mklib: Making NetBSD PIC static library: " ${LIBNAME}
>-	    FINAL_LIBS=`make_ar_static_lib cq 1 ${LIBNAME} ${OBJECTS}`
>-	else
>-	    LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
>-	    echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
>-	    rm -f ${LIBNAME}
>-	    ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS}
>-	    FINAL_LIBS=${LIBNAME}
>-	fi
>-	;;
>-
>     'IRIX' | 'IRIX64')
>         if [ $STATIC = 1 ] ; then
> 	    LIBNAME="lib${LIBNAME}.a"
>--- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2011-01-05 22:50:55.000000000 +0100
>+++ src/mesa/drivers/dri/mach64/mach64_context.h	2011-01-05 22:52:17.000000000 +0100
>@@ -295,11 +295,11 @@
> #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
> #define LE32_OUT_FLOAT( x, y )	do { *(GLfloat *)(x) = (y); } while (0)
> #else
>-#ifndef __OpenBSD__
>-#include <byteswap.h>
>-#else
>+#if defined(__OpenBSD__) || defined(__NetBSD__)
> #include <machine/endian.h>
> #define bswap_32 bswap32
>+#else
>+#include <byteswap.h>
> #endif
> 
> #define LE32_IN( x )		bswap_32( *(GLuint *)(x) )

Actions: View | Splinter Review

Attachments on bug 32859: 41692

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.