Attachment 219497 Details for Bug 250990 – Make graphics/blender and graphics/openshadinglanguage respect LLVM_DEFAULT

[patch] Make graphics/blender and graphics/openshadinglanguage respect LLVM_DEFAULT

blender_openshadinglanguage.diff (text/plain), 1.29 KB, created by Vladimir Druzenko on 2020-11-09 17:51:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-11-09 17:51:26 UTC

Size: 1.29 KB

patch

obsolete

>--- graphics/blender/Makefile.orig
>+++ graphics/blender/Makefile
>@@ -51,7 +51,6 @@
> .endif
> 
> PLIST_SUB+=	VER=${DISTVERSION:R}
>-LLVM_VER=	90
> OPTIONS_SUB=	yes
> 
> .include "${.CURDIR}/Makefile.options"
>@@ -162,6 +161,13 @@
> 
> .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:
>--- graphics/openshadinglanguage/Makefile.orig
>+++ graphics/openshadinglanguage/Makefile
>@@ -33,11 +33,10 @@
> 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
> 
>@@ -57,6 +56,14 @@
> # 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>
>

Actions: View | Diff

Attachments on bug 250990: 219497 | 219558