Attachment #219497 for bug #250990




.endif

PLIST_SUB+=	VER=${DISTVERSION:R}
LLVM_VER=	90
OPTIONS_SUB=	yes

.include "${.CURDIR}/Makefile.options"


.if defined(WITH_DEBUG)
CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
.endif

.include <bsd.port.pre.mk>
.if ${LLVM_DEFAULT:M[678]0}
LLVM_VER=	90
.else
LLVM_VER=	${LLVM_DEFAULT}
.endif

post-patch-OPENCOLORIO-on:




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_CXX_STANDARD=14
# This flag fixes linking with clang 9.0 ??
CXXFLAGS+=	-DNDEBUG


# DISTVERSION has an extra digit which isn't in the lib name
# for LIBVERS we want the first three digits
PLIST_SUB+=	LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/}

.include <bsd.port.pre.mk>

.if ${LLVM_DEFAULT:M[678]0}
LLVM_VER=	90
.else
LLVM_VER=	${LLVM_DEFAULT}
.endif

.include <bsd.port.options.mk>


Return to bug 250990

Lines 51-57 Link Here

(-)graphics/blender/Makefile (-1 / +7 lines)
51	.endif	51	.endif
52		52
53	PLIST_SUB+= VER=${DISTVERSION:R}	53	PLIST_SUB+= VER=${DISTVERSION:R}
54	LLVM_VER= 90
55	OPTIONS_SUB= yes	54	OPTIONS_SUB= yes
56		55
57	.include "${.CURDIR}/Makefile.options"	56	.include "${.CURDIR}/Makefile.options"
Lines 162-167 Link Here
162		161
163	.if defined(WITH_DEBUG)	162	.if defined(WITH_DEBUG)
164	CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON	163	CMAKE_ARGS+= -DWITH_GHOST_DEBUG:BOOL=ON
		164	.endif
		165
		166	.include <bsd.port.pre.mk>
		167	.if ${LLVM_DEFAULT:M[678]0}
		168	LLVM_VER= 90
		169	.else
		170	LLVM_VER= ${LLVM_DEFAULT}
165	.endif	171	.endif
166		172
167	post-patch-OPENCOLORIO-on:	173	post-patch-OPENCOLORIO-on:

Lines 33-43 Link Here

(-)graphics/openshadinglanguage/Makefile (-2 / +9 lines)
33	LDFLAGS+= -fuse-ld=lld	33	LDFLAGS+= -fuse-ld=lld
34	.endif	34	.endif
35		35
36	LLVM_VER= 90
37	CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS	36	CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS
38	CMAKE_OFF= USE_BOOST_WAVE	37	CMAKE_OFF= USE_BOOST_WAVE
39	CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \	38	CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
40	-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}	39	-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} -DCMAKE_CXX_STANDARD=14
41	# This flag fixes linking with clang 9.0 ??	40	# This flag fixes linking with clang 9.0 ??
42	CXXFLAGS+= -DNDEBUG	41	CXXFLAGS+= -DNDEBUG
43		42
Lines 57-62 Link Here
57	# DISTVERSION has an extra digit which isn't in the lib name	56	# DISTVERSION has an extra digit which isn't in the lib name
58	# for LIBVERS we want the first three digits	57	# for LIBVERS we want the first three digits
59	PLIST_SUB+= LIBVERS=${DISTVERSION:C/([0-9])\.([0-9])\.([0-9])(.)/\1.\2.\3/}	58	PLIST_SUB+= LIBVERS=${DISTVERSION:C/([0-9])\.([0-9])\.([0-9])(.)/\1.\2.\3/}
		59
		60	.include <bsd.port.pre.mk>
		61
		62	.if ${LLVM_DEFAULT:M[678]0}
		63	LLVM_VER= 90
		64	.else
		65	LLVM_VER= ${LLVM_DEFAULT}
		66	.endif
60		67
61	.include <bsd.port.options.mk>	68	.include <bsd.port.options.mk>
62		69