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
This commit is contained in:
Koop Mast 2016-04-04 12:24:33 +00:00
parent 7a5720c8c9
commit 6e3ae05a8e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=412510
2 changed files with 4 additions and 8 deletions

View file

@ -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}

View file

@ -25,12 +25,9 @@ ONLY_FOR_ARCHS_REASON= Clover needs a graphics driver supported by the Radeon KM
#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"