svn commit: r538207 - head/graphics/mesa-dri

[Emmanuel Vadot]

Author: manu
Date: Mon Jun  8 09:55:38 2020
New Revision: 538207
URL: https://svnweb.freebsd.org/changeset/ports/538207

Log:
  mesa*: Switch to using a native-file for llvm
  
  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)

Modified:
  head/graphics/mesa-dri/Makefile.common
  head/graphics/mesa-dri/Makefile.targets

Modified: head/graphics/mesa-dri/Makefile.common
==============================================================================
--- head/graphics/mesa-dri/Makefile.common	Mon Jun  8 09:32:54 2020	(r538206)
+++ head/graphics/mesa-dri/Makefile.common	Mon Jun  8 09:55:38 2020	(r538207)
@@ -100,7 +100,7 @@ BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llv
 .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

Modified: head/graphics/mesa-dri/Makefile.targets
==============================================================================
--- head/graphics/mesa-dri/Makefile.targets	Mon Jun  8 09:32:54 2020	(r538206)
+++ head/graphics/mesa-dri/Makefile.targets	Mon Jun  8 09:55:38 2020	(r538207)
@@ -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