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

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Apr 27 15:53:39 2020 +0200| [583a941d13996d96d45a7f0d886666abbf64c260] | committer: Hugo Beauzée-Luyssen

contrib: meson: Use meson properties to pass PKG_CONFIG_PATH/LIBDIR

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=583a941d13996d96d45a7f0d886666abbf64c260
---

 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