svn commit: r555532 - in head/graphics: blender openshadinglanguage
Dima Panov
fluffy at FreeBSD.org
Tue Nov 17 02:10:43 UTC 2020
Author: fluffy
Date: Tue Nov 17 02:10:43 2020
New Revision: 555532
URL: https://svnweb.freebsd.org/changeset/ports/555532
Log:
graphics/blender and graphics/openshadinglanguage: respect LLVM_DEFAULT
PR: 250990
Submitted by: vvd at unislabs.com
Approved by: maintainer
Modified:
head/graphics/blender/Makefile
head/graphics/openshadinglanguage/Makefile
Modified: head/graphics/blender/Makefile
==============================================================================
--- head/graphics/blender/Makefile Tue Nov 17 01:45:11 2020 (r555531)
+++ head/graphics/blender/Makefile Tue Nov 17 02:10:43 2020 (r555532)
@@ -51,7 +51,6 @@ LDFLAGS+= -fuse-ld=lld
.endif
PLIST_SUB+= VER=${DISTVERSION:R}
-LLVM_VER= 90
OPTIONS_SUB= yes
.include "${.CURDIR}/Makefile.options"
@@ -162,6 +161,14 @@ XF86VMODE_USE= XORG=xi,xxf86vm
.if defined(WITH_DEBUG)
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:
Modified: head/graphics/openshadinglanguage/Makefile
==============================================================================
--- head/graphics/openshadinglanguage/Makefile Tue Nov 17 01:45:11 2020 (r555531)
+++ head/graphics/openshadinglanguage/Makefile Tue Nov 17 02:10:43 2020 (r555532)
@@ -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
@@ -59,6 +58,12 @@ CXXFLAGS+= -I${STAGEDIR}/include
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},' \
More information about the svn-ports-all
mailing list