[vlc-devel] [PATCH 2/2] contrib: meson: Don't use env variables for PKG_CONFIG_*

[Steve Lhomme]

Sounds good.

On 2020-04-24 17:14, Hugo Beauzée-Luyssen wrote:
> Instead, use meson's dedicated properties, since the environment
> variables appear to be ignored when cross compiling
> ---
>   contrib/src/main.mak | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index 708885cdec..2eebf0e4c5 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -423,8 +423,10 @@ ifdef HAVE_CROSS_COMPILE
>   # generated crossfile, so everything should work as
>   # expected.
>   MESONFLAGS += --cross-file $(abspath crossfile.meson)
> -MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \
> -	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" meson $(MESONFLAGS)
> +MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" meson \
> +	-Dpkg_config_libdir="$(PKG_CONFIG_LIBDIR)" \
> +	-Dpkg_config_path="$(PKG_CONFIG_PATH)" \
> +	$(MESONFLAGS)
>   else
>   MESON = meson $(MESONFLAGS)
>   endif
> -- 
> 2.20.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>