From 9f84b296968f52e899c1b210437ec1a47cd473f0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 28 Sep 2019 22:04:31 +0200 Subject: [PATCH] package/mesa3d: add llvm-config to meson [binaries] The meson buildsystem does not honour environment variables; instead, it insists that path to programs be passed in the [binaries] section of the cross-compilation.conf. So, that is what we must do to pass the path to llvm-config. Note that, LLVM_CONFIG does exist in the mesa3d source code, but it is limited to the Scons buildsystem, and is also a leftover from when mesa3d was using the autotools. It has never worked with the meson buildsystem. Signed-off-by: Yann E. MORIN Cc: Romain Naour Cc: Bernd Kuhls Reviewed-by: Romain Naour Tested-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/mesa3d/mesa3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 35fe2bdbe5..03a9c49a69 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -33,7 +33,7 @@ MESA3D_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm -MESA3D_CONF_ENV += LLVM_CONFIG=$(STAGING_DIR)/usr/bin/llvm-config +MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' MESA3D_CONF_OPTS += -Dllvm=true else # Avoid automatic search of llvm-config -- 2.30.2