diff options
| author | kwm <kwm@FreeBSD.org> | 2016-04-04 12:24:33 +0000 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2016-04-04 12:24:33 +0000 |
| commit | bf5741c29ee92c3a5f0287baa03eaee038d581cd (patch) | |
| tree | e5da8275b38838f3c94d4a3cd3a644dab2118e49 | |
| parent | 003082ee3650d503e6701502af95181e7fa37738 (diff) | |
| download | FreeBSD-ports-bf5741c29ee92c3a5f0287baa03eaee038d581cd.zip FreeBSD-ports-bf5741c29ee92c3a5f0287baa03eaee038d581cd.tar.gz | |
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
| -rw-r--r-- | graphics/libGL/Makefile.common | 7 | ||||
| -rw-r--r-- | lang/clover/Makefile | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/graphics/libGL/Makefile.common b/graphics/libGL/Makefile.common index 106785d..0ad3569 100644 --- a/graphics/libGL/Makefile.common +++ b/graphics/libGL/Makefile.common @@ -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} diff --git a/lang/clover/Makefile b/lang/clover/Makefile index eb95e79..8897b0c 100644 --- a/lang/clover/Makefile +++ b/lang/clover/Makefile @@ -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" |
