mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

mesa*: Switch to using a native-file for llvm

Browse Source 
Meson seems to not care that a llvm-config binary exists and will prefer
to use llvm-config-devel for some reason.
Using a native-file fixes that and meson will correctly use the llvm specified
in it.

PR:	247026
Approved by:	zeising (x11@ implicit)
This commit is contained in:
Emmanuel Vadot 2020-06-08 09:55:38 +00:00
parent fcf5aedf81
commit f914799192
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=538207
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/mesa-dri/Makefile.common
View File

@ -100,7 +100,7 @@ BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
.if ${COMPONENT} != libs
RUN_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
.endif
BINARY_ALIAS+= llvm-config=llvm-config${LLVM_DEFAULT}
MESON_ARGS+= --native-file="${WRKSRC}/llvm.ini"
LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
MESON_ARGS+= -Dllvm=true
.endif

5
graphics/mesa-dri/Makefile.targets
View File

@ -2,6 +2,11 @@
#
# this file holds common targets
pre-configure:
${PRINTF} "[binaries]\nllvm-config = '${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}'" \
> ${WRKSRC}/llvm.ini
post-patch:
@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
${WRKSRC}/src/util/xmlconfig.c