[vlc-devel] [PATCH] contrib: meson: Use meson properties to pass PKG_CONFIG_PATH/LIBDIR

[Alexandre Janniaux]

Hi,

Perfect, LGTM,

Regards,
--
Alexandre Janniaux
Videolabs

On Mon, Apr 27, 2020 at 04:01:50PM +0200, Hugo Beauzée-Luyssen wrote:
> In addition to environment variables. Those are ignored when cross
> compiling starting with meson 0.54
> Use of environment variables should be removed in the future
> ---
>  contrib/src/main.mak | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index 708885cdec..10282bd29a 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -424,7 +424,11 @@ ifdef HAVE_CROSS_COMPILE
>  # 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)
> +	PKG_CONFIG_PATH="$(PKG_CONFIG_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