[vlc-commits] [Git][videolan/vlc][master] contrib: set pkg_config_libdir in meson crossfile

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
791c4833 by Mehdi Sabwat at 2021-12-02T14:35:26+00:00
contrib: set pkg_config_libdir in meson crossfile

pkg_config_libdir is not a builtin option, to use
it we need to define it either in the meson.build of the
project or in the crossfile.

This used to fail silently, but since PR#8974 (meson 0.60.0.rc1)
it is a fatal error.

- - - - -


2 changed files:

- contrib/src/gen-meson-crossfile.py
- contrib/src/main.mak


Changes:

=====================================
contrib/src/gen-meson-crossfile.py
=====================================
@@ -34,6 +34,7 @@ if os.environ.get('HOST_SYSTEM') == 'darwin':
 _add_environ_val('ar', 'AR')
 _add_environ_val('strip', 'STRIP')
 _add_environ_val('pkgconfig', 'PKG_CONFIG')
+_add_environ_val('pkg_config_libdir', 'PKG_CONFIG_LIBDIR')
 _add_environ_val('windres', 'WINDRES')
 
 # Properties section


=====================================
contrib/src/main.mak
=====================================
@@ -431,8 +431,7 @@ ifdef HAVE_CROSS_COMPILE
 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 -Dpkg_config_libdir="$(PKG_CONFIG_LIBDIR)" \
-	-Dpkg_config_path="$(PKG_CONFIG_PATH)" \
+	meson -Dpkg_config_path="$(PKG_CONFIG_PATH)" \
 	$(MESONFLAGS)
 
 else



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/791c4833683a19bcf5de2ce946c07425224c901d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/791c4833683a19bcf5de2ce946c07425224c901d
You're receiving this email because of your account on code.videolan.org.