Date: Sun, 3 Nov 2013 00:23:30 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332565 - head/graphics/openshadinglanguage Message-ID: <201311030023.rA30NUQX012562@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Sun Nov 3 00:23:29 2013 New Revision: 332565 URL: http://svnweb.freebsd.org/changeset/ports/332565 Log: Unconditionally depend on clang32 so we're using a clang that matches our llvm-as. Modified: head/graphics/openshadinglanguage/Makefile Modified: head/graphics/openshadinglanguage/Makefile ============================================================================== --- head/graphics/openshadinglanguage/Makefile Sun Nov 3 00:18:44 2013 (r332564) +++ head/graphics/openshadinglanguage/Makefile Sun Nov 3 00:23:29 2013 (r332565) @@ -11,12 +11,12 @@ COMMENT= Advanced shading language for p LICENSE= BSD -BUILD_DEPENDS= llvm>=3.1:${PORTSDIR}/devel/llvm \ +BUILD_DEPENDS= llvm-config32:${PORTSDIR}/devel/llvm32 \ flex>=2.5.37:${PORTSDIR}/textproc/flex LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ OpenImageIO:${PORTSDIR}/graphics/openimageio -RUN_DEPENDS= llvm>=3.1:${PORTSDIR}/devel/llvm +RUN_DEPENDS= llvm-config32:${PORTSDIR}/devel/llvm32 USE_GITHUB= yes GH_ACCOUNT= imageworks @@ -27,6 +27,7 @@ GH_COMMIT= 18671dc WRKSRC= ${WRKDIR}/imageworks-OpenShadingLanguage-${GH_COMMIT}/src CMAKE_ARGS= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex \ + -DLLVM_CONFIG:STRING=${LOCALBASE}/bin/llvm-config32 \ -DUSE_TBB:BOOL=OFF CXXFLAGS+= -I${LOCALBASE}/include/flex USE_LDCONFIG= yes @@ -35,9 +36,7 @@ USES= bison cmake:outsource NO_STAGE= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} < 900000 -BUILD_DEPENDS+= clang:${PORTSDIR}/lang/clang -.endif +BUILD_DEPENDS+= clang32:${PORTSDIR}/lang/clang32 .if ${ARCH} == i386 CFLAGS+= -march=i586
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311030023.rA30NUQX012562>