svn commit: r412510 - in head: graphics/libGL lang/clover

[Koop Mast]

Author: kwm
Date: Mon Apr  4 12:24:33 2016
New Revision: 412510
URL: https://svnweb.freebsd.org/changeset/ports/412510

Log:
  Now that the bug in llvm37 is fixed [1], clover can be enabled again on
  10.1-RELEASE i386.
  
  [1] https://svnweb.freebsd.org/changeset/ports/412196

Modified:
  head/graphics/libGL/Makefile.common
  head/lang/clover/Makefile

Modified: head/graphics/libGL/Makefile.common
==============================================================================
--- head/graphics/libGL/Makefile.common	Mon Apr  4 12:09:42 2016	(r412509)
+++ head/graphics/libGL/Makefile.common	Mon Apr  4 12:24:33 2016	(r412510)
@@ -89,8 +89,7 @@ CONFIGURE_ARGS+=	--enable-gles2
 .if ${OPSYS} == DragonFly || \
 	(${OPSYS} == FreeBSD && \
 		(${OSVERSION} >= 1001000 && ${ARCH} == amd64 || \
-		${OSVERSION} >= 1002000 && ${ARCH} == i386))
-# Disabled on 10.1-R i386 because of compile issues with libclc.
+		${OSVERSION} >= 1001000 && ${ARCH} == i386))
 
 BUILD_DEPENDS+=	libclc>=0.0.r222830:devel/libclc
 
@@ -117,9 +116,9 @@ CONFIGURE_ARGS+=	--disable-opencl
 CONFIGURE_ARGS+=	--enable-osmesa
 
 # gallium
-BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=0:devel/llvm${MESA_LLVM_VER}
+BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.7.l_1:devel/llvm${MESA_LLVM_VER}
 .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
-RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=0:devel/llvm${MESA_LLVM_VER}
+RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=3.7.1_1:devel/llvm${MESA_LLVM_VER}
 .endif
 
 CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}

Modified: head/lang/clover/Makefile
==============================================================================
--- head/lang/clover/Makefile	Mon Apr  4 12:09:42 2016	(r412509)
+++ head/lang/clover/Makefile	Mon Apr  4 12:24:33 2016	(r412510)
@@ -25,12 +25,9 @@ ONLY_FOR_ARCHS_REASON=	Clover needs a gr
 #MESA_BUILD_WRKSRC=	src/util src/glsl src/mesa src/gallium
 MESA_INSTALL_WRKSRC=	src/gallium/targets/opencl src/gallium/targets/pipe-loader
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000 && ${ARCH} == amd64
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000
 IGNORE=		Clover is only supported on FreeBSD 10.1 and newer
 .endif
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 && ${ARCH} == i386
-IGNORE=		Clover is only supported on FreeBSD 10.2 and newer
-.endif
 
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"