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

[Koop Mast]

Author: kwm
Date: Tue Mar 29 14:14:54 2016
New Revision: 412113
URL: https://svnweb.freebsd.org/changeset/ports/412113

Log:
  Exclude libclc (and thus OpenCL) on 10.1 i386.
  
  There is a wierd issue with base clang and llvm37 which stops libclc to
  build on 10.1 i386. So disable it so we don't block 1500+ ports.
  
  Submitted by:	pkg-fallout via antoine@

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

Modified: head/graphics/libGL/Makefile.common
==============================================================================
--- head/graphics/libGL/Makefile.common	Tue Mar 29 14:09:47 2016	(r412112)
+++ head/graphics/libGL/Makefile.common	Tue Mar 29 14:14:54 2016	(r412113)
@@ -87,8 +87,11 @@ CONFIGURE_ARGS+=	--enable-gles2
 
 # Clover (OpenCL).
 .if ${OPSYS} == DragonFly || \
-	(${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && \
-	 (${ARCH} == i386 || ${ARCH} == amd64))
+	(${OPSYS} == FreeBSD && \
+		(${OSVERSION} >= 1001000 && ${ARCH} == amd64 || \
+		${OSVERSION} >= 1002000 && ${ARCH} == i386))
+# Disabled on 10.1-R i386 because of compile issues with libclc.
+
 BUILD_DEPENDS+=	libclc>=0.0.r222830:${PORTSDIR}/devel/libclc
 
 # We need the clang port too even if it is not used to compile because

Modified: head/lang/clover/Makefile
==============================================================================
--- head/lang/clover/Makefile	Tue Mar 29 14:09:47 2016	(r412112)
+++ head/lang/clover/Makefile	Tue Mar 29 14:14:54 2016	(r412113)
@@ -25,9 +25,12 @@ 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
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000 && ${ARCH} == amd64
 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"