Message ID | 71bd376fbcc68a2171acdc72d9bfddd0e60bcefd.1569701061.git.yann.morin.1998@free.fr |
---|---|
State | Accepted |
Headers | show |
Series | [1/2] core/pkg-meson: allow packages to add extra [binaries] | expand |
Hi Yann, Le 28/09/2019 à 22:04, Yann E. MORIN a écrit : > 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 <yann.morin.1998@free.fr> > Cc: Romain Naour <romain.naour@gmail.com> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> Tested with mesa3d and llvm support. Reviewed-by: Romain Naour <romain.naour@gmail.com> Tested-by: Romain Naour <romain.naour@gmail.com> Best regards, Romain > --- > 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 b47c6b9b2e..205bf96285 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 >
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b47c6b9b2e..205bf96285 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
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 <yann.morin.1998@free.fr> Cc: Romain Naour <romain.naour@gmail.com> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/mesa3d/mesa3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)