[vlc-commits] [Git][videolan/vlc][master] contrib: meson: Don't override PKG_CONFIG_LIBDIR

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

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


Commits:
74060949 by Hugo Beauzée-Luyssen at 2022-01-20T13:50:42+00:00
contrib: meson: Don't override PKG_CONFIG_LIBDIR

When overriding the environment variable, we might cause a pkg-config
wrapper to skip setting its environment variable when cross compiling.
By providing an empty string, we'd effectively disable detection of all
available packages in a non-default path.

- - - - -


1 changed file:

- contrib/src/main.mak


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -429,7 +429,7 @@ 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)" \
+MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" \
 	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
 	meson -Dpkg_config_path="$(PKG_CONFIG_PATH)" \
 	$(MESONFLAGS)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/74060949afbbca285fefdc746f61ff43ed2cb213

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