[vlc-commits] contrib: force the PKG_CONFIG_LIBDIR for CMake when compiling in msys

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Mar 18 16:00:27 2020 +0100| [d3e3543323b2e05ac9844a0aa88868669b4c5cb7] | committer: Steve Lhomme

contrib: force the PKG_CONFIG_LIBDIR for CMake when compiling in msys

The pkg-config in msys overwrites/loses the PKG_CONFIG_PATH but not the
PKG_CONFIG_LIBDIR, so we set the PKG_CONFIG_LIBDIR (which is empty anyway) to
the value of PKG_CONFIG_PATH.

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

 contrib/src/main.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index d48c1d72a8..18fb49cf65 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -395,6 +395,7 @@ ifdef HAVE_WIN32
 CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=
 endif
 ifdef MSYS_BUILD
+CMAKE := PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)" $(CMAKE)
 CMAKE += -DCMAKE_LINK_LIBRARY_SUFFIX:STRING=.a
 endif