kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

graphics/blender and graphics/openshadinglanguage: respect LLVM_DEFAULT

Browse source 
PR:		250990
Submitted by:	vvd@unislabs.com
Approved by:	maintainer
This commit is contained in:
Dima Panov 2020-11-17 02:10:43 +00:00
parent 4cff3f057d
commit f493bd68e5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=555532
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
graphics/blender/Makefile
View file

@ -51,7 +51,6 @@ LDFLAGS+= -fuse-ld=lld
.endif
PLIST_SUB+= VER=${DISTVERSION:R}
LLVM_VER= 90
OPTIONS_SUB= yes
.include "${.CURDIR}/Makefile.options"
@ -164,6 +163,14 @@ XF86VMODE_USE= XORG=xi,xxf86vm
CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON
.endif
.include <bsd.port.options.mk>
.if ${LLVM_DEFAULT:M[678]0}
LLVM_VER= 90
.else
LLVM_VER= ${LLVM_DEFAULT}
.endif
post-patch-OPENCOLORIO-on:
@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \
${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake

9
graphics/openshadinglanguage/Makefile
View file

@ -33,11 +33,10 @@ GH_PROJECT= OpenShadingLanguage
LDFLAGS+= -fuse-ld=lld
.endif
LLVM_VER= 90
CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS
CMAKE_OFF= USE_BOOST_WAVE
CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} -DCMAKE_CXX_STANDARD=14
# This flag fixes linking with clang 9.0 ??
CXXFLAGS+= -DNDEBUG
@ -60,6 +59,12 @@ PLIST_SUB+= LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/}
.include <bsd.port.options.mk>
.if ${LLVM_DEFAULT:M[678]0}
LLVM_VER= 90
.else
LLVM_VER= ${LLVM_DEFAULT}
.endif
post-patch:
@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
-e 's,%%PYCMD%%,${PYTHON_CMD},' \