svn commit: r355979 - in head/graphics: dri libGL

[Koop Mast]

Author: kwm
Date: Sat May 31 14:15:47 2014
New Revision: 355979
URL: http://svnweb.freebsd.org/changeset/ports/355979
QAT: https://qat.redports.org/buildarchive/r355979/

Log:
  Move the ARCH = i386 check to bsd.mesalib.mk so it applies to all
  Mesa ports. This will unbreak libglapi/libGL/libglesv2 on i386.
  
  This was probably exposed by when the libglapi port was added.

Modified:
  head/graphics/dri/Makefile
  head/graphics/libGL/bsd.mesalib.mk

Modified: head/graphics/dri/Makefile
==============================================================================
--- head/graphics/dri/Makefile	Sat May 31 14:08:39 2014	(r355978)
+++ head/graphics/dri/Makefile	Sat May 31 14:15:47 2014	(r355979)
@@ -26,8 +26,7 @@ USE_XORG=	glproto x11 xext xxf86vm xdama
 CC=clang
 CXX=clang++
 CPP=clang-cpp
-# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older.
-. elif ${OSVERSION} < 901500 || ${ARCH} == i386
+. elif ${OSVERSION} < 901500
 USE_GCC=yes
 . endif
 .endif

Modified: head/graphics/libGL/bsd.mesalib.mk
==============================================================================
--- head/graphics/libGL/bsd.mesalib.mk	Sat May 31 14:08:39 2014	(r355978)
+++ head/graphics/libGL/bsd.mesalib.mk	Sat May 31 14:15:47 2014	(r355979)
@@ -56,6 +56,11 @@ SHEBANG_FILES=	src/gallium/*/*/*.py src/
 		src/gallium/drivers/svga/svgadump/svga_dump.py \
 		src/glsl/tests/compare_ir src/mapi/glapi/gen/*.py \
 		src/mapi/mapi/mapi_abi.py
+
+# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older. 
+. if ${ARCH} == i386
+USE_GCC=yes
+. endif
 .else
 CONFIGURE_ARGS+=--disable-glut --disable-glw --disable-glu