Attachment 219360 Details for Bug 250869 – use default LLVM version as possible

[patch] use default LLVM version as possible

patch-mesa-dri.diff (text/plain), 1.41 KB, created by Eric Camachat on 2020-11-04 17:43:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Camachat

Created: 2020-11-04 17:43:01 UTC

Size: 1.41 KB

patch

obsolete

>diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
>index 9c5e702a86c9..597b35a50f41 100644
>--- a/graphics/mesa-dri/Makefile.common
>+++ b/graphics/mesa-dri/Makefile.common
>@@ -100,19 +100,27 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_auxiliary_meson.build \
> BINARY_ALIAS+=	python3=${PYTHON_VERSION}
> 
> .if ${ARCH} == powerpc64
>-LLVM_DEFAULT=	90
>-BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>=9.0.1_2:devel/llvm${LLVM_DEFAULT}
>+.if ${LLVM_DEFAULT:M[678]0}
>+LLVM_VERSION=	90
>+.else
>+LLVM_VERSION=	${LLVM_DEFAULT}
>+.endif
>+BUILD_DEPENDS+=	llvm${LLVM_VERSION}>=9.0.1_2:devel/llvm${LLVM_VERSION}
> .if ${COMPONENT} != libs
>-RUN_DEPENDS+=	llvm${LLVM_DEFAULT}>=9.0.1_2:devel/llvm${LLVM_DEFAULT}
>+RUN_DEPENDS+=	llvm${LLVM_VERSION}>=9.0.1_2:devel/llvm${LLVM_VERSION}
> .endif
> .else
>-#LLVM_DEFAULT=	10
>-BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>=10.0.1_1:devel/llvm${LLVM_DEFAULT}
>+.if ${LLVM_DEFAULT:M[6789]0}
>+LLVM_VERSION=	10
>+.else
>+LLVM_VERSION=	${LLVM_DEFAULT}
>+.endif
>+BUILD_DEPENDS+=	llvm${LLVM_VERSION}>=10.0.1_1:devel/llvm${LLVM_VERSION}
> .if ${COMPONENT} != libs
>-RUN_DEPENDS+=	llvm${LLVM_DEFAULT}>=10.0.1_1:devel/llvm${LLVM_DEFAULT}
>+RUN_DEPENDS+=	llvm${LLVM_VERSION}>=10.0.1_1:devel/llvm${LLVM_VERSION}
> .endif
> .endif
> 
> MESON_ARGS+=	--native-file="${WRKSRC}/llvm.ini"
>-LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
>+LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_VERSION}/lib
> MESON_ARGS+=	-Dllvm=enabled

Actions: View | Diff

Attachments on bug 250869: 219360