[Mesa-dev] [PATCH 3/4] build: Haiku build fixes, BeOS code removal

[Alexander von Gluck]

* Use generic pthread barrier on Haiku.
* Re-add debug_printf define for Haiku.
* Add mapi headers to r300 build (to not rely on makedepend?)
* Remove NDEBUG define of union, as the union is used
   regardless of NDEFINE setting.
* Remove BeOS reference to not building GLU as BeOS is no
   longer a Mesa target.
---
  src/gallium/auxiliary/os/os_thread.h |    2 +-
  src/gallium/auxiliary/util/u_debug.h |    2 --
  src/gallium/drivers/r300/Makefile    |    1 +
  src/glsl/link_uniforms.cpp           |    2 --
  src/glu/sgi/Makefile                 |    7 +------
  src/mesa/main/querymatrix.c          |    2 +-
  6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/gallium/auxiliary/os/os_thread.h 
b/src/gallium/auxiliary/os/os_thread.h
index d830129..3e1c273 100644
--- a/src/gallium/auxiliary/os/os_thread.h
+++ b/src/gallium/auxiliary/os/os_thread.h
@@ -314,7 +314,7 @@ typedef int64_t pipe_condvar;
   * pipe_barrier
   */

-#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || 
defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU)) && 
!defined(PIPE_OS_ANDROID)
+#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || 
defined(PIPE_OS_SOLARIS)) && !defined(PIPE_OS_ANDROID)

  typedef pthread_barrier_t pipe_barrier;

diff --git a/src/gallium/auxiliary/util/u_debug.h 
b/src/gallium/auxiliary/util/u_debug.h
index b5ea405..677e478 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -75,7 +75,6 @@ _debug_printf(const char *format, ...)
   * - avoid outputing large strings (512 bytes is the current maximum length
   * that is guaranteed to be printed in all platforms)
   */
-#if !defined(PIPE_OS_HAIKU)
  static INLINE void
  debug_printf(const char *format, ...) _util_printf_format(1,2);

@@ -92,7 +91,6 @@ debug_printf(const char *format, ...)
  #endif
  }

-#endif /* !PIPE_OS_HAIKU */

  /*
   * ... isn't portable so we need to pass arguments in parentheses.
diff --git a/src/gallium/drivers/r300/Makefile 
b/src/gallium/drivers/r300/Makefile
index 5f56fc4..3e3a765 100644
--- a/src/gallium/drivers/r300/Makefile
+++ b/src/gallium/drivers/r300/Makefile
@@ -15,6 +15,7 @@ C_SOURCES += \
  LIBRARY_INCLUDES = \
  	-I$(TOP)/include \
  	-I$(TOP)/src/mesa \
+	-I$(TOP)/src/mapi \
  	-I$(TOP)/src/glsl

  include ../../Makefile.template
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index c7de480..fc1c1f7 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -336,9 +336,7 @@ link_assign_uniform_locations(struct gl_shader_program 
*prog)
        rzalloc_array(prog, struct gl_uniform_storage, num_user_uniforms);
     union gl_constant_value *data =
        rzalloc_array(uniforms, union gl_constant_value, num_data_slots);
-#ifndef NDEBUG
     union gl_constant_value *data_end = &data[num_data_slots];
-#endif

     parcel_out_uniform_storage parcel(prog->UniformHash, uniforms, data);

diff --git a/src/glu/sgi/Makefile b/src/glu/sgi/Makefile
index c8b29ed..94427e2 100644
--- a/src/glu/sgi/Makefile
+++ b/src/glu/sgi/Makefile
@@ -124,12 +124,7 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
  ##### TARGETS #####

  default:
-	@if [ "${CONFIG_NAME}" = "beos" ] ; then \
-		echo "$(GLU_LIB_NAME) not build under BeOS, but integrated into 
${GL_LIB_NAME}." ; \
-		exit 0 ; \
-	else \
-		$(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) || exit 1 ; \
-	fi
+	$(MAKE) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) || exit 1 ; \

  $(TOP)/$(LIB_DIR):
  	-mkdir $(TOP)/$(LIB_DIR)
diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c
index eaedf7c..2843d55 100644
--- a/src/mesa/main/querymatrix.c
+++ b/src/mesa/main/querymatrix.c
@@ -73,7 +73,7 @@ fpclassify(double x)
  #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || 
\
       defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 
|| \
       (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) 
|| \
-     (defined(__sun) && defined(__GNUC__)) || defined(ANDROID)
+     (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || 
defined(__HAIKU__)

  /* fpclassify is available. */

-- 
1.7.2.5