From owner-svn-ports-all@FreeBSD.ORG  Sat May 31 14:15:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 51495360;
 Sat, 31 May 2014 14:15:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3EA9E2CE0;
 Sat, 31 May 2014 14:15:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VEFmHD040510;
 Sat, 31 May 2014 14:15:48 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VEFlaS040508;
 Sat, 31 May 2014 14:15:47 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201405311415.s4VEFlaS040508@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 31 May 2014 14:15:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355979 - in head/graphics: dri libGL
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 May 2014 14:15:48 -0000

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